Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit4d7b7d9a88012563463df82b904a6859400de7d9
authorMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 18 Jul 2011 08:38:37 +0000 (18 14:08 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 18 Jul 2011 08:38:37 +0000 (18 14:08 +0530)
tree1e8e6baa43845a2f65d0e10feb55d4042510ecf7
parent0e4435266b588de8788b01bb92bf8261c3762ab5
parent1b5691656ef67e5f07c5e218f2dacc6d36ae0a77
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS