Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle
commitdd24216a3b5407c18e70dfee8648b27a637ec767
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:04:25 +0000 (14 12:04 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Nov 2016 11:04:25 +0000 (14 12:04 +0100)
tree31efb22c561d7b57582c78c7c814c7b0e0888111
parented81eab30961f4dae4513f7f40e1f1bc0c1747b4
parent51c6d25b3b11f3f0651bd02659258c2a9bb4888a
Merge branch 'MDL-56880-m' of https://github.com/micaherne/moodle