Merge branch '44182-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 06:49:10 +0000 (14:49 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 06:49:10 +0000 (14:49 +0800)

Trivial merge