Merge branch 'master_MDL-61050' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 19:38:29 +0000 (20:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 19:38:29 +0000 (20:38 +0100)
commit8d9a55a05b60ff8f614916c6f37817ddfa9725f0
tree2b54d420d7f78b5103abda42dc253f5122c65ff3
parentd8ef541bbca455bb745e9a2088ee3c6e2ca7ec46
parent0c64c64b4855ceab7f40fb402e062061cc774729
Merge branch 'master_MDL-61050' of https://github.com/danmarsden/moodle