Merge branch 'MDL-50523' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jul 2015 00:16:36 +0000 (08:16 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jul 2015 00:16:36 +0000 (08:16 +0800)

Trivial merge