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

2010-07-19 16:04:50 +02:00
parent cf99d6511f e0d1e92336
commit 4376f6ce14
69 changed files with 10556 additions and 3027 deletions
--- a/libraries/config/user_preferences.forms.php
+++ b/libraries/config/user_preferences.forms.php
@@ -137,6 +137,7 @@ $forms['Import']['Open_Document'] = array(
 $forms['Export']['Export_defaults'] = array(
    'Export/format',
    'Export/compression',
+    'Export/asfile',
    'Export/remember_file_template',
    'Export/file_template_table',
    'Export/file_template_database',