Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: cdf84e9bade6d2eaf6a4ba6ce03b06ac24f0e515 https://github.com/phpmyadmin/phpmyadmin/commit/cdf84e9bade6d2eaf6a4ba6ce03b... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-07-25 (Sat, 25 Jul 2015)

Changed paths: M build.xml

Log Message: ----------- Excluse sql parser from PHPCS analysis.

Signed-off-by: Hugues Peccatte hugues.peccatte@gmail.com

Commit: 252e1f6586eafa9971b7fd8939d1757bdb3e99b5 https://github.com/phpmyadmin/phpmyadmin/commit/252e1f6586eafa9971b7fd8939d1... Author: Hugues Peccatte hugues.peccatte@gmail.com Date: 2015-07-25 (Sat, 25 Jul 2015)

Changed paths: M po/fr.po M po/hy.po M po/sl.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/a5b96a4bf2f4...252e1f6586ea