Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: d6488e2f586d924434923752574c06f1c3cbb0dc https://github.com/phpmyadmin/phpmyadmin/commit/d6488e2f586d924434923752574c... Author: Marc Delisle marc@infomarc.info Date: 2013-10-21 (Mon, 21 Oct 2013)

Changed paths: M test/classes/PMA_Error_test.php

Log Message: ----------- Fix coding style

Commit: b13e47bab0d05ae0e74b4f049c26052b6a31d589 https://github.com/phpmyadmin/phpmyadmin/commit/b13e47bab0d05ae0e74b4f049c26... Author: Marc Delisle marc@infomarc.info Date: 2013-10-21 (Mon, 21 Oct 2013)

Changed paths: M po/zh_TW.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/73301d099ba3...b13e47bab0d0