Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit3611d48325f6e2990a5d29060503237f83d52257
authorMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 1 Aug 2011 04:10:36 +0000 (1 09:40 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 1 Aug 2011 04:10:36 +0000 (1 09:40 +0530)
tree5f3a9de9d12cbc9e49cb6d24eeb2d174f2add446
parent36c55adb9ebc4b341bc52e3ad839b9909365fa78
parent15a384a2d510416857994908e6c6b45fc2b1e7e2
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS