Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit0387ea0b40ad47dea5fad3c2b432452b31605dd1
authorMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 17 Aug 2011 11:18:50 +0000 (17 16:48 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 17 Aug 2011 11:18:50 +0000 (17 16:48 +0530)
tree87e89f8ff4035f348aa1ac0c792d4354a38e3323
parent46722b80359c81626bdbc429329b1bc710db3530
parentaca93f450864947014d618c41c508d5522209d06
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS