Fixed conflict due to upstream merge

2010-07-23 21:59:15 +05:30
parent 13ec1423f6 049886139c
commit e646a2760c
331 changed files with 127280 additions and 132228 deletions
--- a/setup/lib/forms.inc.php
+++ b/setup/lib/forms.inc.php
@@ -74,8 +74,6 @@ $forms['Server_tracking'] = array('Servers' => array(1 => array(
 $forms['Import_export'] = array(
    'UploadDir',
    'SaveDir',
-    'AllowAnywhereRecoding',
-    'DefaultCharset',
    'RecodingEngine',
    'IconvExtraParams',
    'ZipDump',