| commit | 14d12d1dedfd5b023e6385f3cbb0a2eb3a12b326 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Thu, 1 Apr 2010 14:30:59 +0000 (1 10:30 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Thu, 1 Apr 2010 14:30:59 +0000 (1 10:30 -0400) | ||
| tree | 0684d5dcb80088fdf8054595c185141093070507 | treesnapshot (tar.gz zip) |
| parent | 46eb3e47211f5b187291462f94541f1f440cadcf | commitdiff |
| parent | d9008701482252d3c8f35b8bcaafec4afa3b6310 | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin