Merge branch 'MDL-47979-master-blocks-config' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:42:26 +0000 (23:42 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 9 Nov 2015 22:42:26 +0000 (23:42 +0100)

Trivial merge