Merge branch 'MDL-52078-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 05:53:58 +0000 (13:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 5 Jan 2016 05:53:58 +0000 (13:53 +0800)

Trivial merge