Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit29455fe79bc9896129d7004e0242c451f4a32cc8
authorMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 24 Nov 2011 17:42:37 +0000 (24 23:12 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Thu, 24 Nov 2011 17:42:37 +0000 (24 23:12 +0530)
tree27c5f821d279ea0769afbf5768a3b4388c17fdaf
parentff0ea2f9b960359234fab02a74b156bc9bb1e383
parentcf5faa1dd1bcae329eddb793765ad2ba3e4471dc
Merge branch 'QA_3_4' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin into QA_3_4