| commit | 18166bd49227fde30323f47196a384d463d257cf | |
| author | Marc Delisle <marc@infomarc.info> | |
| Fri, 23 Jul 2010 12:36:03 +0000 (23 08:36 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Fri, 23 Jul 2010 12:36:03 +0000 (23 08:36 -0400) | ||
| tree | c40bd541a2def0d45aad45b0d445343fb5545ab3 | treesnapshot (tar.gz zip) |
| parent | 36402785de6e5d93779a8e84c5d5d40692bbc82b | commitdiff |
| parent | e02935a1d5ad5090434ff6a258d367814832a1df | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin