Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 24720826cc6f038398d2d7ebef5b74318e1760d9 https://github.com/phpmyadmin/phpmyadmin/commit/24720826cc6f038398d2d7ebef5b... Author: Marc Delisle <marc@infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/Config.class.php Log Message: ----------- Fix coding style Signed-off-by: Marc Delisle <marc@infomarc.info> Commit: 9b15ce4d27801c119af02c05f055db5ecf083bb7 https://github.com/phpmyadmin/phpmyadmin/commit/9b15ce4d27801c119af02c05f055... Author: Marc Delisle <marc@infomarc.info> Date: 2014-05-19 (Mon, 19 May 2014) Changed paths: M libraries/server_status_monitor.lib.php Log Message: ----------- Merge branch 'master' of https://github.com/phpmyadmin/phpmyadmin Compare: https://github.com/phpmyadmin/phpmyadmin/compare/437c717eb3e1...9b15ce4d2780