Merge branch 'MDL-56301-master' of https://github.com/snake/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:10:40 +0000 (14:10 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Dec 2016 06:10:40 +0000 (14:10 +0800)

Trivial merge