Merge branch 'MDL-55928-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Oct 2016 06:59:11 +0000 (14:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 4 Oct 2016 06:59:11 +0000 (14:59 +0800)

Trivial merge