Merge branch '45147-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 06:16:23 +0000 (14:16 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 06:16:23 +0000 (14:16 +0800)

Trivial merge