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

Trivial merge