| commit | 0e3b294ff22ac44fe8954c8f97ea2be01f9d75a8 | |
| author | Marc Delisle <marc@infomarc.info> | |
| Wed, 15 Apr 2015 12:01:09 +0000 (15 08:01 -0400) | ||
| committer | Marc Delisle <marc@infomarc.info> | |
| Wed, 15 Apr 2015 12:01:09 +0000 (15 08:01 -0400) | ||
| tree | 73972a56590b16e680ee78d1a733dfdd14100dea | treesnapshot (tar.gz zip) |
| parent | 603f93d168f11265271e8f4dd4434b1b96ba0058 | commitdiff |
| parent | 61e413b3ead70e3aa2ddd590c1b45d4140a94715 | commitdiff |
Merge branch 'QA_4_4' of https://github.com/phpmyadmin/phpmyadmin into QA_4_4