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

Simple merge