Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 18:28:54 +0000 (19:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Oct 2016 18:47:40 +0000 (19:47 +0100)
commit7aa17ce256095f909d0b19763d67dea1ca8a7b8e
tree68c51c197b693fef3803a32b7da8e317407e92a5
parentde1af8a6ed2ab04a9878a4b9d1cc30cdae2d9425
parent0f13ffbc63f7762b1d1bcddcd97e4c2887898de9
Merge branch 'MDL-56297-master' of git://github.com/damyon/moodle