Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit7d4dc5522f748def2b2815a038ce2d55ca9aef1f
authorMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 15 Feb 2011 18:00:34 +0000 (15 23:30 +0530)
committerMadhura Jayaratne <madhura.cj@gmail.com>
Tue, 15 Feb 2011 18:00:34 +0000 (15 23:30 +0530)
tree736b49a91849d817b1beb1fb1a41b3666be6d9ac
parentec5bdf87131383201dad0f1c8bc3af9eeb6d7caa
parent494ad67e78d2a97590a2435e54202ca6dc6d9ef8
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin