Merge branch 'MDL-55166-master-blocksettings' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:33:58 +0000 (00:33 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 22:33:58 +0000 (00:33 +0200)

Trivial merge