Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 19:25:31 +0000 (20:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 19:25:31 +0000 (20:25 +0100)
commit8df0fb490bda880f7f1c358d331c9220dd60747b
treecc0c89a3327ddec03b084c410f8b46886efce089
parent2fd11f3516aafc355881425aeabd6ad9423b6da1
parent3abda0332de11fad26e9086ecb5b2b3521b16d95
Merge branch 'wip-MDL-56615-master' of git://github.com/marinaglancy/moodle