Merge branch '43033-27' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 01:33:39 +0000 (09:33 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 2 Dec 2013 01:33:39 +0000 (09:33 +0800)

Trivial merge