Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit6f9f58080e06e795aba963ad169e438e6fae00a2
authorMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 14 Sep 2011 17:19:09 +0000 (14 22:49 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Wed, 14 Sep 2011 17:19:09 +0000 (14 22:49 +0530)
tree851fe94e48b5c41f784c5a740b6e0fe51f5d62c8
parent1f26c2f84181deab4cfcafe3a862520c5ee456e3
parentabc1d3c345dfd11ea3d940c5b944d05fc173ec34
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin