Merge branch 'MDL-52004-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:38:07 +0000 (13:38 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 05:38:07 +0000 (13:38 +0800)

Trivial merge