Merge branch '42350-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 09:21:29 +0000 (17:21 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Nov 2013 09:21:29 +0000 (17:21 +0800)

Trivial merge