Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle
commit1c56029fa41916009fe6f3065c8ac8ebcba58bd1
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Oct 2016 07:55:36 +0000 (13 09:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 13 Oct 2016 17:35:48 +0000 (13 19:35 +0200)
tree73a124ac07949c9259ecdd144ea59a0f9e6a2b0c
parentdd8f30dd4f4b1fb9402c3421c90427aee181569c
parent62a3c42947e0e0184554cbe459a967a4c41e0224
Merge branch 'wip-MDL-56110-master' of https://github.com/marinaglancy/moodle