Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:23:20 +0000 (00:23 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Jun 2015 22:23:20 +0000 (00:23 +0200)
commit75704fe6b82c71054e0203ea06fd0b451b2f8f25
treeea7dc3431e7ecb59bd218a6c4f17b764f7829992
parentdb91aae8f465add7198d102b22e6bb43954aa6f6
parent621847333427f422d6df1a50901323d3a6aeaa5f
Merge branch 'wip-MDL-28954-master' of https://github.com/marinaglancy/moodle