| commit | 0df2fcd70d5d8f3c2671d38f9fad668f6937251a | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sat, 2 Oct 2010 20:34:55 +0000 (2 16:34 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sat, 2 Oct 2010 20:34:55 +0000 (2 16:34 -0400) | ||
| tree | f0522b76fee56d8924b4fa4bdbf0e84a7b1b7006 | treesnapshot (tar.gz zip) |
| parent | f503d5667e481b65b6249966e3d5da97b013ea3f | commitdiff |
| parent | 864fb1a0038d1c3c3a7c2e649176e0e86fbdd622 | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin