From: Sam Hemelryk Date: Wed, 4 Dec 2013 19:25:35 +0000 (+1300) Subject: Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle X-Git-Tag: v2.7.0-beta~981 X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=ec6219a2e7a2d38c458cbe8d458a0393ee78ba32 Merge branch 'MDL-42084-master' of git://github.com/sammarshallou/moodle --- ec6219a2e7a2d38c458cbe8d458a0393ee78ba32