Merge branch 'MDL-56196-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:59:02 +0000 (11:59 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 03:59:02 +0000 (11:59 +0800)

Trivial merge