From: Andrew Nicols <andrew@nicols.co.uk>
Date: Mon, 20 Jun 2016 06:09:54 +0000 (+0800)
Subject: Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle
X-Git-Tag: v3.2.0-beta~993
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=5c3de4fe5534426cd76d75048d8e48332d98a06f

Merge branch 'wip-MDL-54590-master-test' of git://github.com/abgreeve/moodle
---

5c3de4fe5534426cd76d75048d8e48332d98a06f