Merge branch 'MDL-54125_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 06:11:07 +0000 (14:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 May 2016 06:11:07 +0000 (14:11 +0800)

Trivial merge