From: Sam Hemelryk Date: Mon, 6 Jan 2014 01:19:11 +0000 (+1300) Subject: Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle X-Git-Tag: v2.7.0-beta~822 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=8e06909afdb87e728130342013f2b7851b665a75 Merge branch 'w01_MDL-43528_m27_magic' of https://github.com/skodak/moodle --- 8e06909afdb87e728130342013f2b7851b665a75