Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit7fca97fdde95fdcbc59c008b474e95792d228377
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 3 Jun 2011 20:00:20 +0000 (4 01:30 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 3 Jun 2011 20:00:20 +0000 (4 01:30 +0530)
tree62f64f5808f032df30b2655efd7fe534f7108216
parentc6ff56a78977937d869b7cbac8b6f10ee4c49c1e
parent75091e52fde4633f990a60a5f70ffa58aeb623da
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into OpenGIS
libraries/display_tbl.lib.php