Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commitd5175bc7df9ab457d25664b48ab392866c0e2197
authorlorilee <leelorik@gmail.com>
Wed, 23 Jun 2010 01:12:41 +0000 (22 21:12 -0400)
committerlorilee <leelorik@gmail.com>
Wed, 23 Jun 2010 01:12:41 +0000 (22 21:12 -0400)
tree571a2dfc81d7f53f365a9e45266fce18f8f6f245
parent40b9e360adfd56719cfaec4080b499b998e2ef77
parent4792d21a8a3ad46dd80bd06423f39251ad706362
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc