Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc

2010-07-26 13:44:30 -07:00
parent 89b0a3082e 2a59451ac5
commit 428053bef5
164 changed files with 70695 additions and 65467 deletions
--- a/navigation.php
+++ b/navigation.php
@@ -110,9 +110,8 @@ if ($GLOBALS['server'] && ! strlen($GLOBALS['db'])) {
 $db_start = $GLOBALS['db'];

 /**
- * the relation library
+ * the relation settings
 */
-require_once './libraries/relation.lib.php';
 $cfgRelation = PMA_getRelationsParam();

 /**