Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:14:50 +0000 (21:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 17 Feb 2015 20:14:50 +0000 (21:14 +0100)
commit40156b3bec4e6f2852ea72b7bcfe0840f09d7fea
tree3a9058ef4c44101602b85c1834788fbdbc1230e1
parent10598f2485189722fab4792f27572d217ba50c03
parent6f5d9a93503957bd34cf963bff7b563b931082ff
Merge branch 'MDL-49178_m29v2' of https://github.com/sbourget/moodle