From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 16 Nov 2016 06:05:07 +0000 (+0800)
Subject: Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle
X-Git-Tag: v3.2.0-rc1~44
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=0064cb1193e2e05973015390727894cc8137e83d;hp=-c

Merge branch 'MDL-56967-master' of git://github.com/damyon/moodle
---

0064cb1193e2e05973015390727894cc8137e83d