Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Jan 2017 19:40:48 +0000 (20:40 +0100)
commit4a237e932a57285cf6d863336313292f1a6062c6
treeb05c88d60ce24d1974af1f573322fb882648a1a1
parent419b2f1741740951e85348a486c8c306e1330b01
parentda06c819474dae1b4903e37c78c6e0c30521b939
Merge branch 'wip-MDL-57608-master-3' of git://github.com/marinaglancy/moodle