Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin

Resolved conflicts:
	setup/lib/forms.inc.php
	setup/lib/messages.inc.php

libraries/config/setup.forms.php

@@ -75,8 +75,6 @@ $forms['Servers']['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Features']['Import_export'] = array(
     'UploadDir',
     'SaveDir',
-    'AllowAnywhereRecoding',
-    'DefaultCharset',
     'RecodingEngine',
     'IconvExtraParams',
     'ZipDump',