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)

Trivial merge