Merge branch 'MDL-51476' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 03:40:40 +0000 (11:40 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 29 Sep 2015 03:40:40 +0000 (11:40 +0800)

Trivial merge