From: Sam Hemelryk Date: Sun, 28 Sep 2014 20:02:52 +0000 (+1300) Subject: Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle X-Git-Tag: v2.8.0-beta~154 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c8674e5ca5ad27da67a822282071016de2d21ffa;hp=-c Merge branch 'MDL-47380-master' of https://github.com/sammarshallou/moodle --- c8674e5ca5ad27da67a822282071016de2d21ffa