Merge branch 'MDL-50894_master' of https://github.com/gedion/moodle
commit1877b7551ee907cc639a6783965f30f28160c221
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:18:34 +0000 (11 14:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 11 Aug 2015 12:18:34 +0000 (11 14:18 +0200)
tree5af2b85ba90340bf9c431e585479f35cc5cafd00
parent99c582a19f4500b4688411b8c154c658fc547cc0
parentc28eb52862ee8d4cb75fde970b2d21081b169ec1
Merge branch 'MDL-50894_master' of https://github.com/gedion/moodle