| commit | 26126bec307fbe08d58b32be04b294a47bc3d8fc | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sat, 8 Jan 2011 20:16:12 +0000 (8 15:16 -0500) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sat, 8 Jan 2011 20:16:12 +0000 (8 15:16 -0500) | ||
| tree | 24023cfc03577813d901eb51ba2db2251f5a9194 | treesnapshot (tar.gz zip) |
| parent | 6094e6c644a50519731b9413f6e7c4418747d65e | commitdiff |
| parent | 797d2466e6cb7910fb8808e194b0d8f25258e97d | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin