Merge branch 'MDL-54715-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 06:53:24 +0000 (14:53 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 24 May 2016 06:53:24 +0000 (14:53 +0800)

Trivial merge