Merge branch 'wip-MDL-56912-master' of git://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 12:21:06 +0000 (12:21 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 19 Dec 2016 12:21:06 +0000 (12:21 +0000)

Trivial merge