| commit | e459494e708f3269ede2ee5da2bdfd43c85c2ca0 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sun, 19 Dec 2010 11:22:36 +0000 (19 06:22 -0500) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sun, 19 Dec 2010 11:22:36 +0000 (19 06:22 -0500) | ||
| tree | 8808624060de78db26df9fb3253c0226ed1b8d2d | treesnapshot (tar.gz zip) |
| parent | ea8a2bbc4f8f1486d4253f98391021adda7b0174 | commitdiff |
| parent | e4b6f71162776574832ceb5f6b8dea14afb8ce3e | commitdiff |
Merge branch 'master' of ssh://phpmyadmin.git.sourceforge.net/gitroot/phpmyadmin/phpmyadmin