Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGISmaster
commit027e4d6ac4d0ee54c43bd2331d561bcdbdb15b26
authorMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 7 Dec 2011 16:04:43 +0000 (7 21:34 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 7 Dec 2011 16:04:43 +0000 (7 21:34 +0530)
tree740e2f57822177ba839b28666068fd2fe80ef0e6
parent3813b62611009e9cde2e36e3a5865402ea0275ed
parent38484291182a0340c6032bb86d1139d9206a0469
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/madhuracj into OpenGIS