Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin...
commit5fab0e993cb3f8393b58d5da38a6533b6c19a2ab
authorlorilee <leelorik@gmail.com>
Wed, 14 Jul 2010 18:33:45 +0000 (14 11:33 -0700)
committerlorilee <leelorik@gmail.com>
Wed, 14 Jul 2010 18:33:45 +0000 (14 11:33 -0700)
tree6c62659ef2a6b97c3dbd056970606e46dc0eff27
parentf06363811c9887a0719827cbc012e97e3680348b
parenta038d59f7a0524a00682e8a7e2f3e4cda781f98a
Merge branch 'master' of git://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin
libraries/config.default.php
libraries/export/csv.php