From: Andrew Nicols <andrew@nicols.co.uk>
Date: Wed, 9 Nov 2016 06:37:47 +0000 (+0800)
Subject: Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle
X-Git-Tag: v3.2.0-rc1~155
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=55a391140843cd2b718b5f1b54e00ee266798273

Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle
---

55a391140843cd2b718b5f1b54e00ee266798273