Merge branch '43714-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 06:49:26 +0000 (14:49 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 21 Jan 2014 06:49:26 +0000 (14:49 +0800)

Trivial merge