Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit49d95b557378475701c4e7987870bbf03e53e31e
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 12 Mar 2011 17:56:40 +0000 (12 23:26 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 12 Mar 2011 17:56:40 +0000 (12 23:26 +0530)
tree56cda6c1198356d0dac8c35ac324d2d62672f7b6
parent27ed977ce16340aaa6a1807ec1f91fa8fe6484f7
parentf74b5775a4a5326ecd21290fe5f6c0e857f4045c
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin