Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit8cd7179f80581ff86e5cc3f4ddd10e4f688cf515
authorMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 18 Feb 2011 13:26:20 +0000 (18 18:56 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Fri, 18 Feb 2011 13:26:20 +0000 (18 18:56 +0530)
tree8f375b09cdc2d6b38940d8474391e7aed943fa66
parentda82fe392b0ac802284abee3810aae9f2bc4b381
parente831df2a32e7aa7f420fca1c65b797891a298fca
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin