Merge branch 'MDL-58826_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:44:18 +0000 (01:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:44:18 +0000 (01:44 +0200)
commitfa58bc0a36b6cb1196f4673dcf067cbcd0837fc4
treef44d67b9a81b57c8ad6fd3cb6af22b2d98f242d3
parent31409e07185e6daa5d12a893a31a5d8b61db3fcc
parent7e732c5d5ab341779d6c0843ae1bc40d112ffc1d
Merge branch 'MDL-58826_master' of https://github.com/marxjohnson/moodle