Merge branch '43016-27' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 04:21:20 +0000 (12:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 25 Nov 2013 04:21:20 +0000 (12:21 +0800)

Trivial merge