Merge branch 'MDL-51228-master' of https://github.com/dthies/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 05:39:36 +0000 (13:39 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:34 +0000 (16:31 +0100)

Trivial merge