Merge branch 'MDL-55121-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 07:12:50 +0000 (15:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 11 Nov 2016 07:12:50 +0000 (15:12 +0800)

Trivial merge