Merge branch 'MDL-51789' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 06:38:51 +0000 (14:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 06:38:51 +0000 (14:38 +0800)

Trivial merge