Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: c44db2e2a1811aa807990e69bbc812201fd80cc8 https://github.com/phpmyadmin/phpmyadmin/commit/c44db2e2a1811aa807990e69bbc8... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-02 (Thu, 02 Jul 2015)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Variable 'selectionBox' implicitly declared.

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

Commit: bbd58f36cb12d32584817a06bb8df34547f3a005 https://github.com/phpmyadmin/phpmyadmin/commit/bbd58f36cb12d32584817a06bb8d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-02 (Thu, 02 Jul 2015)

Changed paths: M js/server_status_monitor.js

Log Message: ----------- Variable 'l' implicitly declared.

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

Commit: 51d789c80f438299d2b31cd6b4315467254761f5 https://github.com/phpmyadmin/phpmyadmin/commit/51d789c80f438299d2b31cd6b431... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-07-02 (Thu, 02 Jul 2015)

Changed paths: M CONTRIBUTING.md M README M README.rst M changelog.php M composer.json M doc/developers.rst M doc/faq.rst M doc/intro.rst M doc/other.rst M doc/setup.rst M examples/swekey.sample.conf M index.php M libraries/Config.class.php M libraries/Util.class.php M libraries/plugins/auth/AuthenticationCookie.class.php M libraries/plugins/auth/swekey/swekey.auth.lib.php M libraries/plugins/export/ExportXml.class.php M scripts/create-release.sh M scripts/upload-release M setup/frames/index.inc.php M themes.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/0ef3f23e5664...51d789c80f43