Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 91a4ca445d015e3aa75542c00be47c475b93e7bd https://github.com/phpmyadmin/phpmyadmin/commit/91a4ca445d015e3aa75542c00be4... Author: Marc Delisle marc@infomarc.info Date: 2012-11-03 (Sat, 03 Nov 2012)

Changed paths: M libraries/config/messages.inc.php M libraries/config/setup.forms.php M libraries/config/user_preferences.forms.php M libraries/user_preferences.inc.php M setup/frames/menu.inc.php

Log Message: ----------- Replace "frame" with "panel" and "left" with "navi" or "navigation"

Commit: 5bd7678e0967bc728da0a225370af8ae9a3c3dc2 https://github.com/phpmyadmin/phpmyadmin/commit/5bd7678e0967bc728da0a225370a... Author: Marc Delisle marc@infomarc.info Date: 2012-11-03 (Sat, 03 Nov 2012)

Changed paths: M test/classes/PMA_Footer_test.php

Log Message: ----------- Merge branch 'master' of github.com:phpmyadmin/phpmyadmin

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/43abd118688c...5bd7678e0967