Merge branch 'MDL-51824-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 05:56:49 +0000 (13:56 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 26 Oct 2015 05:56:49 +0000 (13:56 +0800)

Trivial merge