Merge branch '40975-26-r1' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 07:37:29 +0000 (15:37 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 6 Nov 2013 07:37:29 +0000 (15:37 +0800)

Trivial merge