Merge branch 'MDL-53247-master' of git://github.com/danpoltawski/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 01:17:13 +0000 (09:17 +0800)
committerDavid Monllao <davidm@moodle.com>
Tue, 8 Mar 2016 01:17:13 +0000 (09:17 +0800)
1  2 
lib/adminlib.php

Simple merge