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/libraries/plugin_interface.lib.php
+++ b/libraries/plugin_interface.lib.php
@@ -3,7 +3,6 @@
 /**
 * Generic plugin interface.
 *
- * @version $Id$
 * @package phpMyAdmin
 */