Merge branch 'MDL-54881' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jun 2016 03:31:19 +0000 (11:31 +0800)

Trivial merge