Merge branch '42060-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 19 Nov 2013 02:39:30 +0000 (10:39 +0800)

Trivial merge