Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 37d50745f1dc2ee6b538e9fe11af93dc7b26a1ce https://github.com/phpmyadmin/phpmyadmin/commit/37d50745f1dc2ee6b538e9fe11af... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-07 (Fri, 07 Aug 2015)

Changed paths: M build.xml

Log Message: ----------- sql-formatter is no lognger used. Exclude sql-parser instead

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

Commit: 4526ccc446f108566803d4a7117d745d86910e5e https://github.com/phpmyadmin/phpmyadmin/commit/4526ccc446f108566803d4a7117d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2015-08-07 (Fri, 07 Aug 2015)

Changed paths: M po/fr.po

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/6191daaf67e6...4526ccc446f1