Merge branch 'MDL-41759-master' of https://github.com/jamiepratt/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 07:32:45 +0000 (15:32 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 17 Feb 2014 07:32:45 +0000 (15:32 +0800)

Trivial merge