Merge branch '42452-26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 02:37:59 +0000 (10:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Mon, 4 Nov 2013 02:37:59 +0000 (10:37 +0800)

Trivial merge