Merge branch 'MDL-50788-master' of git://github.com/danpoltawski/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 00:08:51 +0000 (08:08 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 13 Oct 2015 00:08:51 +0000 (08:08 +0800)

Trivial merge