From: Andrew Nicols <andrew@nicols.co.uk>
Date: Thu, 4 May 2017 02:14:41 +0000 (+0800)
Subject: Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
X-Git-Tag: v3.3.0-rc1~25
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=680ad78cf074387dbb3834e98a70c7a9460715c9

Merge branch 'MDL-58684-master-2' of https://github.com/snake/moodle
---

680ad78cf074387dbb3834e98a70c7a9460715c9