Merge branch 'feature/MDL-56830' of https://github.com/fwsl/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:00:46 +0000 (12:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Dec 2016 11:00:46 +0000 (12:00 +0100)
1  2 
lib/blocklib.php

Simple merge