Merge branch 'MDL-54953-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 07:11:14 +0000 (15:11 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 4 Jul 2016 07:11:14 +0000 (15:11 +0800)

Trivial merge