Merge branch '48025-28' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:39:27 +0000 (15:39 +0800)
committerDamyon Wiese <damyon@moodle.com>
Wed, 5 Nov 2014 07:39:27 +0000 (15:39 +0800)

Trivial merge