Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d0fd5acc0f78cc2baf613e7ff720ba9646cfa674 https://github.com/phpmyadmin/phpmyadmin/commit/d0fd5acc0f78cc2baf613e7ff720... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-10 (Sat, 10 May 2014)

Changed paths: M libraries/Advisor.class.php M test/classes/PMA_Advisor_test.php

Log Message: ----------- Revert 33a30ad7aee5be. Those funcitons are infact used.

Signed-off-by: Madhura Jayaratne madhura.cj@gmail.com

Commit: c93a2f8c0f457ee5cce0bc3afa8d94a05fa83a3f https://github.com/phpmyadmin/phpmyadmin/commit/c93a2f8c0f457ee5cce0bc3afa8d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-10 (Sat, 10 May 2014)

Changed paths: M export.php M libraries/Config.class.php M libraries/Util.class.php M libraries/common.inc.php M libraries/config/Validator.class.php M libraries/export.lib.php M libraries/session.inc.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cff38db7f2b2...c93a2f8c0f45