Merge branch 'MDL-56078-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 01:30:15 +0000 (09:30 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 01:30:15 +0000 (09:30 +0800)

Trivial merge