Merge branch 'MDL-51375' of git://github.com/timhunt/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 16:01:41 +0000 (17:01 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 12 Oct 2015 16:01:41 +0000 (17:01 +0100)

Trivial merge