Merge branch '40693-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 13 Jan 2014 02:07:53 +0000 (10:07 +0800)

Trivial merge