Merge branch 'm29_MDL-48060' of https://github.com/totara/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 16:54:15 +0000 (17:54 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 17:05:24 +0000 (18:05 +0100)
commitaa94403ab2b3813e1e73b76880b1e8d29ddf11c7
tree689c44b50b547748ddd35e1f945ea17a1912e821
parentdab0d47632dd8b5b6f762f7d9dadf9966ad5f76a
parent35fe9b8aa4daf38c532453f15da5470b2b57b9e2
Merge branch 'm29_MDL-48060' of https://github.com/totara/moodle