Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commitc199f6b8bd1e909370b7f091fbb36e3ec092c978
authorMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 1 Feb 2011 06:19:45 +0000 (1 11:49 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 1 Feb 2011 06:19:45 +0000 (1 11:49 +0530)
tree0f84f037ec51eead0e31538f6ea5160fa9aacc43
parent2cbabfd56f0a45d2bb76e7181850e568a381359d
parent1e84e0b7bc097d330e84bf2edb147f8fafb4a9cf
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin