Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:01:46 +0000 (17:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:01:46 +0000 (17:01 +0200)
commit2460f3be57b4a2711d1fc16525b2b0ccb3566df4
treec0e8d16b0f691fc0fc523c65ea37726b391901ed
parent03961256d1ce2f39f9a84173496f0eb44331c06d
parent2b509dbc012315aa5e74df627528a3372faf7279
Merge branch 'MDL-55316-master' of https://github.com/mrmark/moodle