Merge branch '45123-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:54:48 +0000 (11:54 +0800)
committerDan Poltawski <dan@moodle.com>
Fri, 18 Apr 2014 03:54:48 +0000 (11:54 +0800)

Trivial merge