Branch: refs/heads/QA_4_2 Home: https://github.com/phpmyadmin/phpmyadmin Commit: 68761dad9129c151927935d480dcca93e9bcadf1 https://github.com/phpmyadmin/phpmyadmin/commit/68761dad9129c151927935d480dc... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-04 (Sun, 04 May 2014)

Changed paths: M test/libraries/PMA_GIS_modifyQuery_test.php

Log Message: ----------- Update tests to reflect the changes in PMA_GIS_modifyQuery function

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

Commit: 3e5a133e7c2b0ef560fc3a2eb89dee8eceb9b873 https://github.com/phpmyadmin/phpmyadmin/commit/3e5a133e7c2b0ef560fc3a2eb89d... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2014-05-04 (Sun, 04 May 2014)

Changed paths: M po/ta.po

Log Message: ----------- Merge branch 'QA_4_2' of github.com:phpmyadmin/phpmyadmin into QA_4_2

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/9b27679d1398...3e5a133e7c2b