Merge branch 'MDL-49291_master' of git://github.com/markn86/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:04:59 +0000 (08:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:04:59 +0000 (08:04 +0800)

Trivial merge