Merge branch 'MDL-50182' of git://github.com/stronk7/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 00:07:04 +0000 (08:07 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 16 Oct 2015 00:07:04 +0000 (08:07 +0800)

Trivial merge