Merge branch 'MDL-59011-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 May 2017 06:18:34 +0000 (14:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 24 May 2017 06:18:34 +0000 (14:18 +0800)

Trivial merge