Merge branch 'MDL-51914' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2015 01:42:04 +0000 (09:42 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 3 Nov 2015 01:42:04 +0000 (09:42 +0800)

Trivial merge