Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitbdea22fe7dc34986b807badb0a0c9be6e357a313
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 12 Feb 2011 15:59:21 +0000 (12 21:29 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 12 Feb 2011 15:59:21 +0000 (12 21:29 +0530)
tree3497befb150705f06af3a7e0f7e5f15f17eae378
parente81669dce1b3c232cd16ed85947461b186e40a44
parent6169cc11e1aa2cacf96f3bb507f6a98ecc36520e
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin