Merge branch '40249-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 06:33:06 +0000 (14:33 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 26 Aug 2013 06:33:06 +0000 (14:33 +0800)

Trivial merge