Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle
commit2660c96098b9dbf25c27ad7ebc0a78b6544c1c0f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 18:24:13 +0000 (11 20:24 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Oct 2016 18:24:13 +0000 (11 20:24 +0200)
treebb3859db2a5771512c64cb77bb45b43f2eecb406
parentd5bc94628c582cb511a137a9426e9014792ad99c
parent4582da24648e11ea54f86e1f07245853780ba099
Merge branch 'MDL-56319-m' of https://github.com/micaherne/moodle