Merge branch 'wip-MDL-57113-master' of https://github.com/kwiliarty/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:59:54 +0000 (00:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:59:54 +0000 (00:59 +0100)

Trivial merge