Merge branch 'MDL-57205-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 07:03:43 +0000 (15:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 30 Nov 2016 07:03:43 +0000 (15:03 +0800)

Trivial merge