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

Conflicts: libraries/relation.lib.php
2010-07-24 18:34:52 +02:00
parent 2e55d85ab5 084c0dbcf5
commit 2d67cb58c4
328 changed files with 106122 additions and 111373 deletions
--- a/main.php
+++ b/main.php
@@ -2,7 +2,6 @@
 /* vim: set expandtab sw=4 ts=4 sts=4: */
 /**
 *
- * @version $Id$
 * @package phpMyAdmin
 */