Merge branch 'wip-MDL-52039-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 08:48:49 +0000 (08:48 +0000)
committerDan Poltawski <dan@moodle.com>
Mon, 9 Nov 2015 08:48:49 +0000 (08:48 +0000)

Trivial merge