Merge branch 'MDL-56809-master' of git://github.com/ankitagarwal/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 00:49:18 +0000 (08:49 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 22 Nov 2016 00:49:18 +0000 (08:49 +0800)

Trivial merge