Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitba99e8fe12e3a13c839f9bb488ad1ade636bed4e
authorMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 1 Aug 2011 19:04:27 +0000 (2 00:34 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Mon, 1 Aug 2011 19:04:27 +0000 (2 00:34 +0530)
tree66e82e3e46b0aa5bcb61b52f784cd7ff5b47a269
parentdc823602428de00f987425ccdbbb903044572551
parent19172fb476a0082cb5e1e560c3613a99a4f085aa
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS