Merge branch 'wip-MDL-33741-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 2 Aug 2016 11:20:11 +0000 (12:20 +0100)

Trivial merge