| commit | 6fc5270d7c9f37e06439e77d11b8838baff464bd | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sun, 26 Dec 2010 13:20:07 +0000 (26 08:20 -0500) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sun, 26 Dec 2010 13:20:07 +0000 (26 08:20 -0500) | ||
| tree | 19e4b2a3ab306b00e2948090bba28cddf8ef7abd | treesnapshot (tar.gz zip) |
| parent | deff312cc3a72014eb109d9200ec2eb559a8ab54 | commitdiff |
| parent | a874856d01ea9e352a91746806b8dfbfefcba004 | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin