Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Jun 2016 06:09:54 +0000 (14:09 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 20 Jun 2016 06:09:54 +0000 (14:09 +0800)

Trivial merge