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

Trivial merge