From: Sam Hemelryk Date: Mon, 3 Feb 2014 19:28:56 +0000 (+1300) Subject: Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle X-Git-Tag: v2.7.0-beta~601 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=6958c718cc9ba90172d366d68f591cd9b6c799ad;hp=--cc Merge branch 'wip-MDL-39942-master' of https://github.com/kwiliarty/moodle --- 6958c718cc9ba90172d366d68f591cd9b6c799ad