Merge branch 'MDL-51529-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 13:30:18 +0000 (14:30 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:38 +0000 (16:32 +0100)

Trivial merge