Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 10:51:51 +0000 (11:51 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:32:02 +0000 (16:32 +0100)

Trivial merge