Merge branch 'MDL-51842-master' of git://github.com/xow/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 03:29:02 +0000 (11:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 03:29:02 +0000 (11:29 +0800)

Trivial merge