Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Nov 2015 18:59:01 +0000 (19:59 +0100)
commite88100f67398047414e2cb85eee388290912b092
tree41fc223047c4a41ca9d9626f79f6e9d74afb26ea
parent373748277a511b71f1d9a9b1effb54c9d8452db0
parentbb0ac1fdc230ef4ad4b4aff40f3edf812db054fd
Merge branch 'wip-MDL-51999-master' of https://github.com/marinaglancy/moodle