Merge branch '42740-26' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:07:44 +0000 (16:07 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 08:07:44 +0000 (16:07 +0800)

Trivial merge