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

Trivial merge