Merge remote branch 'phpmyadmin/master'
commit811996e92a9365afc4c2ff8549ae887336ace5ad
authorAmmar Yasir <ammaryasir.88@gmail.com>
Thu, 14 Jul 2011 19:08:31 +0000 (15 00:38 +0530)
committerAmmar Yasir <ammaryasir.88@gmail.com>
Thu, 14 Jul 2011 19:08:31 +0000 (15 00:38 +0530)
tree80741e36d36cd5c3dbd7cb1a136afb415529e62d
parentcdf70921a4976d6fbd79793ba7fa2b5c873bbe2b
parent117dd687575b4af0f24ae6f79773122a5a133a23
Merge remote branch 'phpmyadmin/master'
js/messages.php
libraries/config.default.php