Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitbb987837ebf198e60503231bbf7cc9a50eea3337
authorMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 14 Jul 2011 19:04:28 +0000 (15 00:34 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 14 Jul 2011 19:04:28 +0000 (15 00:34 +0530)
treebceb7e1209cf1a6c348b38c3daec1162cde2b9e8
parent6e7c3adbc15eb1f4b822a083b954cbc39a02bc13
parent117dd687575b4af0f24ae6f79773122a5a133a23
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS