Merge branch '41551-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 02:28:27 +0000 (10:28 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 7 Apr 2014 02:28:27 +0000 (10:28 +0800)

Trivial merge