Merge branch '44711-28-r2' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 20 May 2014 12:32:14 +0000 (20:32 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 20 May 2014 12:32:14 +0000 (20:32 +0800)

Trivial merge