From: Dan Poltawski Date: Mon, 2 Dec 2013 03:19:41 +0000 (+0800) Subject: Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle X-Git-Tag: v2.7.0-beta~1038 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=10c12c94a811f0a6c47760703c126afe1917eb98 Merge branch 'wip-MDL-40191-master' of git://github.com/marinaglancy/moodle --- 10c12c94a811f0a6c47760703c126afe1917eb98