Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 06:37:47 +0000 (14:37 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 Nov 2016 06:37:47 +0000 (14:37 +0800)
commit55a391140843cd2b718b5f1b54e00ee266798273
treeedfea2770b1e0d1789e74bd338af092679755534
parent4e2ae9caeeea46934b043a45c6cc770f3830a27b
parentabcd53444b64eba6081227a0a8b56b5893ccd299
Merge branch 'MDL-56726-master-cfgadmin' of git://github.com/mudrd8mz/moodle