Merge branch '41189-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:12:14 +0000 (14:12 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 10 Sep 2013 06:12:14 +0000 (14:12 +0800)

Trivial merge