Merge branch 'MDL-58370-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 04:58:48 +0000 (12:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 20 Apr 2017 04:58:48 +0000 (12:58 +0800)

Trivial merge