Merge branch 'MDL-51790-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 08:04:55 +0000 (16:04 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 08:04:55 +0000 (16:04 +0800)

Trivial merge