Merge branch 'MDL-49338' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:32:00 +0000 (13:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 23 Feb 2016 05:32:00 +0000 (13:32 +0800)

Trivial merge