Branch: refs/heads/master Home: https://github.com/phpmyadmin/phpmyadmin Commit: 0725e792fac59b3a8e5aece58f452b3ed2a57dcc https://github.com/phpmyadmin/phpmyadmin/commit/0725e792fac59b3a8e5aece58f45... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-19 (Wed, 19 Sep 2012)

Changed paths: M test/classes/gis/PMA_GIS_Point_test.php M test/classes/gis/PMA_GIS_Polygon_test.php

Log Message: ----------- Fix doc blocks

Commit: 7cd8052846dd7c18680722b8171aac0be8148352 https://github.com/phpmyadmin/phpmyadmin/commit/7cd8052846dd7c18680722b8171a... Author: Madhura Jayaratne madhura.cj@gmail.com Date: 2012-09-19 (Wed, 19 Sep 2012)

Changed paths: M libraries/dbi/drizzle-wrappers.lib.php M libraries/dbi/drizzle.dbi.lib.php M test/Environment_test.php

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

Compare: https://github.com/phpmyadmin/phpmyadmin/compare/cce715befef6...7cd8052846dd