Merge branch 'MDL-55867_m33v1' of https://github.com/sbourget/moodle
commitaedde678c7f81110b5ebbb761613d923b8602e0b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:52:20 +0000 (21 00:52 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 20 Feb 2017 23:52:20 +0000 (21 00:52 +0100)
tree26228ea9a75a77b49526c971e71db3fed926726c
parentfbbda1ec6ea21708f4b6146d342d18057db3f720
parentaf46e2b83e8aaeaf95389b0dcc8b81cf195bbcd2
Merge branch 'MDL-55867_m33v1' of https://github.com/sbourget/moodle