Merge branch 'MDL-56501-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:10:37 +0000 (14:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 06:10:37 +0000 (14:10 +0800)

Trivial merge