Merge branch 'MDL-51594-master' of git://github.com/jleyva/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 15 Oct 2015 06:19:10 +0000 (14:19 +0800)

Trivial merge