Merge branch 'MDL-57896-master-clicfg' of git://github.com/mudrd8mz/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:41:02 +0000 (17:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 13 Feb 2017 16:41:02 +0000 (17:41 +0100)

Trivial merge