Merge branch '46151-28' of git://github.com/samhemelryk/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 14 Oct 2014 07:34:25 +0000 (15:34 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 14 Oct 2014 07:34:25 +0000 (15:34 +0800)

Trivial merge