Merge branch 'MDL-43479-master' of https://github.com/jamiepratt/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 02:16:15 +0000 (10:16 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 18 Feb 2014 02:16:15 +0000 (10:16 +0800)

Trivial merge