Merge branch 'MDL-50949-master' of git://github.com/FMCorz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2015 00:03:11 +0000 (08:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 10 Aug 2015 00:03:11 +0000 (08:03 +0800)

Trivial merge