Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 16:42:14 +0000 (18:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 17 Oct 2016 16:42:14 +0000 (18:42 +0200)
commitaa46cb9503f8ee832bcea5a5c6413e09d0f7caec
tree9282e2ff99bb15957a682b9f3e649f8bfbfcbafb
parentcfe55553e0dae490e4d11da4fcd3a5650eeccb05
parentb805d3f8ef2ae5b16654dd65354e560e1082564d
Merge branch 'MDL-56057_master' of git://github.com/dmonllao/moodle
lib/adminlib.php