From: Sam Hemelryk Date: Sun, 13 Jul 2014 22:32:28 +0000 (+1200) Subject: Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle X-Git-Tag: v2.8.0-beta~564 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=080fdf0533bada2fc10909f622fbde8324add12c Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle --- 080fdf0533bada2fc10909f622fbde8324add12c