Merge branch 'MDL-56638-master' of git://github.com/crazyserver/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 03:01:25 +0000 (11:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 31 Oct 2016 03:01:25 +0000 (11:01 +0800)

Trivial merge