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

Trivial merge