Merge branch 'MDL-55454' of git://github.com/timhunt/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 02:00:30 +0000 (10:00 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 8 Aug 2016 02:00:30 +0000 (10:00 +0800)

Trivial merge