Merge branch 'MDL-52784' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:54:55 +0000 (08:54 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 19 Jan 2016 00:54:55 +0000 (08:54 +0800)

Trivial merge