Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle
commitb3ec8cf95e71970cc1702ea7b8f10974337c463d
authorDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:44:37 +0000 (16 09:44 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 16 Sep 2015 01:44:37 +0000 (16 09:44 +0800)
tree44094e39d221bca76bae2c2227cecb0f9e1b50f1
parent04fadbeda469b3e81bd4f6e461dc9465e75ee200
parentfd14eb5c401c729d2ffa34f94870001f6f453279
Merge branch 'MDL-46705-master' of git://github.com/dkns/moodle
lib/adminlib.php