Merge branch 'wip-MDL-51636-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 13:59:16 +0000 (14:59 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 5 Oct 2015 13:59:16 +0000 (14:59 +0100)

Trivial merge