Merge remote branch 'phpmyadmin/master'
commit8dd9309fcb059623f51f516689ef222f3b5904fe
authorAmmar Yasir <ammaryasir.88@gmail.com>
Fri, 12 Aug 2011 18:03:13 +0000 (12 23:33 +0530)
committerAmmar Yasir <ammaryasir.88@gmail.com>
Fri, 12 Aug 2011 18:03:13 +0000 (12 23:33 +0530)
treeef502f28e994c64cbcde935c416fbd3d9b4ad6fc
parent1b7e2f6c7be6c7a96d780a7e9870d498f84e7339
parentb319651b70b95c1c70d084ab8519109dae9e5450
Merge remote branch 'phpmyadmin/master'
js/messages.php
libraries/config.default.php