Merge branch 'wip-MDL-57616-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 03:51:59 +0000 (11:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 11 Apr 2017 03:51:59 +0000 (11:51 +0800)

Trivial merge