| commit | 22f9ac76daceb370f468d6720462eb0e61903cf5 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sun, 24 Apr 2011 12:58:25 +0000 (24 08:58 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sun, 24 Apr 2011 12:58:25 +0000 (24 08:58 -0400) | ||
| tree | 6d89ac7ae0d6b571f651c74384a810a5e2b43747 | treesnapshot (tar.gz zip) |
| parent | 8f16bfbc531b654fd61a4b8c6ee78f2f491b6c00 | commitdiff |
| parent | 5de751bd99285cdbcb2212ed03dff0b67155e9db | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin