Merge branch 'MDL-49482-master' of https://github.com/blckct/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:31:48 +0000 (10:31 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 28 Sep 2015 09:31:48 +0000 (10:31 +0100)

Trivial merge