Merge branch 'MDL-52892' of https://github.com/dg711/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 01:39:26 +0000 (09:39 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 01:39:26 +0000 (09:39 +0800)

Trivial merge