Merge branch '44217-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 03:13:38 +0000 (11:13 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 24 Feb 2014 03:13:38 +0000 (11:13 +0800)

Trivial merge