Merge branch '44354-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 02:26:06 +0000 (10:26 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Apr 2014 02:26:06 +0000 (10:26 +0800)

Trivial merge