Merge branch 'mh' into mhtest

data/config/mh/base.ini.php

@@ -68,7 +68,7 @@ $config['thumb']['cut_type'] = 'gd';
 $config['thumb']['impath'] = '';
 
 $config['cache']['type'] 		= 'redis';
-$config['redis']['prefix']      	= 'gx_';
+$config['redis']['prefix']      	= 'nc_';
 $config['redis']['master']['host']     	= MASTER_REDISHOST;
 $config['redis']['master']['port']     	= 6379;
 $config['redis']['master']['pconnect'] 	= 0;