Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commitda2dbdb0f8a75e0b5dc7b82564d10875fc6b7e68
authorlorilee <leelorik@gmail.com>
Wed, 16 Jun 2010 03:43:06 +0000 (15 23:43 -0400)
committerlorilee <leelorik@gmail.com>
Wed, 16 Jun 2010 03:43:06 +0000 (15 23:43 -0400)
tree0bbd1bb01ce4ef7fcbc5bff89cbdb2d0ab5f97c7
parente1ac568a692add52a0878ea5ef0441cd3dc7afd3
parentb8478718c1ce5948a85e43e9b98452dfe5a5dc03
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc