Merge branch 'MDL-56952-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 15 Nov 2016 02:18:01 +0000 (10:18 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 15 Nov 2016 09:07:37 +0000 (09:07 +0000)

Trivial merge