Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle
commit900aa6e5fe7ef601d5e53c2d6cf6ed5fa6a0f57b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 17:12:28 +0000 (2 18:12 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Mar 2015 17:12:28 +0000 (2 18:12 +0100)
treea67dfc3a72ba0b68b4f54b26d5e6efdab0d8579a
parentaa94403ab2b3813e1e73b76880b1e8d29ddf11c7
parentd312bb70b408b9d0d9e29570b153da3ee3dc0dab
Merge branch 'MDL-49328-master' of https://github.com/lucisgit/moodle