Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitac4f0a10b0593b20cb49116df0170912ab292e69
authorMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 14 Jul 2011 04:31:41 +0000 (14 10:01 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 14 Jul 2011 04:31:41 +0000 (14 10:01 +0530)
tree16ce6da93cc89e83959819fc11f90d6e5477f6c6
parent66f73b4114bf8e60496fe052ec86b33c65c3137e
parentad87dcf884efa277fc9ed546e1986e511ae7928a
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS