Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: f8eb1f97988e2423da3c5bfbe90a4c5ee434d037 https://github.com/phpmyadmin/phpmyadmin/commit/f8eb1f97988e2423da3c5bfbe90a... Author: Marc Delisle marc@infomarc.info Date: 2014-07-11 (Fri, 11 Jul 2014)

Changed paths: M libraries/Console.class.php

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

Signed-off-by: Marc Delisle marc@infomarc.info

Commit: a6a8f0743706485d3d16a234628c92c9ea71c963 https://github.com/phpmyadmin/phpmyadmin/commit/a6a8f0743706485d3d16a234628c... Author: Marc Delisle marc@infomarc.info Date: 2014-07-11 (Fri, 11 Jul 2014)

Changed paths: M po/zh_CN.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/3f8bf4fae44f...a6a8f0743706