Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
commit301e3c43e329933778f66a51a2ba7204e1eb12ee
authorlorilee <leelorik@gmail.com>
Tue, 29 Jun 2010 00:50:26 +0000 (28 20:50 -0400)
committerlorilee <leelorik@gmail.com>
Tue, 29 Jun 2010 00:50:26 +0000 (28 20:50 -0400)
tree508adf2a22e136090c5664551f766677d2dca3fb
parentcd7b5448f9cd3219980d285347ba7e125f85fb7a
parentf1a5ae3a9febae34402436a32a73341e202cc1ac
Merge branch 'master' of ssh://repo.or.cz/srv/git/phpmyadmin/lorilee into gsoc
libraries/export/sql.php