Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 21 Mar 2016 23:45:48 +0000 (00:45 +0100)
commit675c6d4b54db622fb03142f757b0d5e09f96db76
tree739f6283f85f738473a28fa7a8df8bf61179cd1c
parentab89d2aebc3a0f2a2d81ed940645cba2cdfc4368
parent5e9b2eda3ceb3af097210eabfded15f0b40d86e5
Merge branch 'wip-MDL-45274-master' of https://github.com/marinaglancy/moodle