Merge branch 'MDL-49618-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jul 2015 04:14:53 +0000 (12:14 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 21 Jul 2015 04:14:53 +0000 (12:14 +0800)

Trivial merge