Merge branch 'MDL-50762-master' of https://github.com/luryus/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jul 2015 01:12:05 +0000 (09:12 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 22 Jul 2015 01:12:05 +0000 (09:12 +0800)

Trivial merge