Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commit8390525de873111b72373b6d8d23f7080df775d8
authorlorilee <leelorik@gmail.com>
Fri, 18 Jun 2010 20:47:29 +0000 (18 16:47 -0400)
committerlorilee <leelorik@gmail.com>
Fri, 18 Jun 2010 20:47:29 +0000 (18 16:47 -0400)
treede6a0c0e5fd299d9b24c9a12f1b47d611072ec8b
parent7363cd380afc8ce49b63743ada752c52fafcbc97
parent90a8e88b72ef578e7673647bdf633772b48664ac
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc