| commit | 79df74937cd20a400837b76f264eef4a4f2fe245 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Mon, 8 Aug 2011 12:27:28 +0000 (8 08:27 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Mon, 8 Aug 2011 12:27:28 +0000 (8 08:27 -0400) | ||
| tree | 13eb8c538efaa5f74acc3e7cb870e36eb808ce78 | treesnapshot (tar.gz zip) |
| parent | 1fa702b45c1d7cadf00fbcd4762f9368517fac09 | commitdiff |
| parent | 4d15c3d1205895b7eccfbcc79a0760c15c71724a | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin