Merge branch 'MDL-58361-master' of https://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:19:58 +0000 (15:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 5 Apr 2017 07:19:58 +0000 (15:19 +0800)

Trivial merge