Merge branch 'MDL-52773-master' of https://github.com/pauln/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 01:13:30 +0000 (09:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 01:13:30 +0000 (09:13 +0800)

Trivial merge