Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commit9dbe9f41153ddec26a1f158e1ad9746a4ba863f5
authorlorilee <leelorik@gmail.com>
Wed, 16 Jun 2010 03:45:44 +0000 (15 23:45 -0400)
committerlorilee <leelorik@gmail.com>
Wed, 16 Jun 2010 03:45:44 +0000 (15 23:45 -0400)
treecc8d3775cd7a9a175343cc53a55a9171307bd3b2
parentda2dbdb0f8a75e0b5dc7b82564d10875fc6b7e68
parent43c0b30a292ba28ee3a6526bd94804bfeb5d5921
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
libraries/common.lib.php