Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle
commit6fdd4633a7e3632330d2d24923a0b0e576514586
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 10:14:52 +0000 (6 11:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 6 Nov 2014 10:14:52 +0000 (6 11:14 +0100)
treefa3423700ae0e32fa771ce97080ff155901d34a2
parente323635e1bb0d6c0b80af88bf500fcf31156a374
parent6887e2e53e19b15ba478bce8fc4986be8c0dcefe
Merge branch 'MDL-48035-master-enfix' of git://github.com/mudrd8mz/moodle