Merge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:20 +0000 (16:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 10 Dec 2015 15:16:20 +0000 (16:16 +0100)
commit0a57ba06cb7fce4d49aa29912ec1a76fcd37c8b0
tree2ab950a84878c2deae88b512ca9fc22279e0c246
parentaa45186ad295f1d363b6fa648ec06d28c61e0df9
parent1766e6a17f8b38e457f4da581f8f3fea2509053a
Merge branch 'MDL-52284-master' of git://github.com/marinaglancy/moodle