Merge branch 'MDL-44707-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 6 Oct 2015 03:35:29 +0000 (11:35 +0800)
committerDan Poltawski <dan@moodle.com>
Tue, 6 Oct 2015 15:31:32 +0000 (16:31 +0100)

Trivial merge