Merge branch '42628-26' of git://github.com/samhemelryk/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 6 Nov 2013 07:04:20 +0000 (15:04 +0800)
committerDan Poltawski <dan@moodle.com>
Wed, 6 Nov 2013 07:04:20 +0000 (15:04 +0800)

Trivial merge