Merge branch 'MDL-51970-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 00:28:57 +0000 (08:28 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 4 Nov 2015 00:28:57 +0000 (08:28 +0800)

Trivial merge