Merge branch 'MDL-53210-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 01:21:47 +0000 (09:21 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 8 Mar 2016 01:21:47 +0000 (09:21 +0800)

Trivial merge