Merge branch 'wip-MDL-50612-master' of https://github.com/marinaglancy/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 09:12:16 +0000 (10:12 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 20 Jul 2015 09:12:16 +0000 (10:12 +0100)

Trivial merge