Merge branch 'mdl46710-master' of https://github.com/tlock/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 13:56:52 +0000 (14:56 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 13:56:52 +0000 (14:56 +0100)

Trivial merge