Merge branch 'MDL-49581_m30v4' of https://github.com/sbourget/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jul 2015 01:32:11 +0000 (09:32 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 29 Jul 2015 01:32:11 +0000 (09:32 +0800)

Trivial merge