Merge branch 'wip-MDL-53402-master-v2' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 08:13:21 +0000 (09:13 +0100)
committerDan Poltawski <dan@moodle.com>
Tue, 3 May 2016 08:13:21 +0000 (09:13 +0100)

Trivial merge