Merge branch 'wip-MDL-49861-master' of git://github.com/abgreeve/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 11:10:17 +0000 (12:10 +0100)
committerDan Poltawski <dan@moodle.com>
Mon, 4 Apr 2016 11:10:17 +0000 (12:10 +0100)

Trivial merge