Merge branch 'MDL-56853-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:36:45 +0000 (14:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 14 Nov 2016 06:36:45 +0000 (14:36 +0800)

Trivial merge