Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit41e0d5cc53d255cc87dc696d492e743ced3097b7
authorMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 29 Jan 2011 20:14:03 +0000 (30 01:44 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Sat, 29 Jan 2011 20:14:03 +0000 (30 01:44 +0530)
treee0febdd0f8cd45126a0076d47816997ff697e1cb
parent88bde613d2ac44b062c377db08caa342049c4d08
parentb6e62ff786339518f5289307eb2d4d8eb3f12684
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin