Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commit2ef4025ec94d2a7d9abeec9b049e0aa5a8d3f0b3
authorlorilee <leelorik@gmail.com>
Thu, 24 Jun 2010 21:25:25 +0000 (24 17:25 -0400)
committerlorilee <leelorik@gmail.com>
Thu, 24 Jun 2010 21:25:25 +0000 (24 17:25 -0400)
treede4174c0018fa97f0a903d96c8f017914f6f8437
parent8984ffffbbd806594b485e5bbd36b990aff9fcec
parentab8bbae65b1a918e6ee06aef4f8eaaed5b1197a6
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc