Merge branch 'MDL-52563-master' of git://github.com/cameron1729/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 12 Jan 2016 04:30:16 +0000 (12:30 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 12 Jan 2016 09:31:05 +0000 (09:31 +0000)

Trivial merge