Merge branch 'MDL-51461' of https://github.com/andrewhancox/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 03:41:10 +0000 (11:41 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:32 +0000 (16:31 +0100)

Trivial merge