Merge branch 'MDL-50464-master' of https://github.com/hcpss-banderson/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:24:23 +0000 (14:24 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Jan 2016 06:24:23 +0000 (14:24 +0800)

Trivial merge