Merge branch 'wip-MDL-49515-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:05:05 +0000 (11:05 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 03:05:05 +0000 (11:05 +0800)

Trivial merge