Merge branch 'MDL-53495' of https://github.com/mr-russ/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 05:29:18 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 6 Jul 2016 05:29:18 +0000 (13:29 +0800)

Trivial merge