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

Conflicts: libraries/display_export.lib.php libraries/display_import.lib.php
2010-07-20 13:04:03 -07:00
parent 8397112a67 2fe1c82426
commit 2ebf96d242
329 changed files with 125970 additions and 127432 deletions
--- a/tbl_import.php
+++ b/tbl_import.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
- * @version $Id$
 * @package phpMyAdmin
 */