Merge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 10:58:35 +0000 (11:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Mar 2015 10:58:35 +0000 (11:58 +0100)
commitbac940ada7b15676fe182252e354ac983f018b65
tree6d4b97edf21e72df7ff7aec656e924f801da66ad
parentbc468d42c7334461d48c77e69ccd5d9ebf770360
parentfc77f56679776f35afc21287f079ff66b0b8e55b
Merge branch 'wip-MDL-49439-master' of https://github.com/marinaglancy/moodle