| commit | 0f0137e187a78448a65bfb2d7d6a1bbc58db1e28 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Sat, 24 Aug 2013 12:01:48 +0000 (24 08:01 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Sat, 24 Aug 2013 12:01:48 +0000 (24 08:01 -0400) | ||
| tree | 3557b87250a578c14dc9ac2ee24b540641fba390 | treesnapshot (tar.gz zip) |
| parent | 8cdc448484a5e31fd7c9a35567aaf2ff16e2d851 | commitdiff |
| parent | 4132bb020b5360abfe1f9b3c8f15f1d107476c71 | commitdiff |
Merge branch 'QA_4_0' of https://github.com/phpmyadmin/phpmyadmin into QA_4_0