| commit | fefd6a7def3433b7b9c52b0016044726015d43eb | |
| author | Marc Delisle <marc@infomarc.info> | |
| Mon, 30 Aug 2010 14:18:12 +0000 (30 10:18 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Mon, 30 Aug 2010 14:18:12 +0000 (30 10:18 -0400) | ||
| tree | 7cf9d8b0bdbd0aafe1fa9f00ce8af2bc331155d8 | treesnapshot (tar.gz zip) |
| parent | b9609f086d55251482419fdfd22bd00915870bd4 | commitdiff |
| parent | 1d67babd5286f9f5198b40ee3a4be21f9643ad8e | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin