Merge branch 'wip-MDL-56776-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 09:46:10 +0000 (09:46 +0000)
committerDan Poltawski <dan@moodle.com>
Wed, 16 Nov 2016 09:46:10 +0000 (09:46 +0000)

Trivial merge