Merge branch 'MDL-59096-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:34:21 +0000 (01:34 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Jun 2017 23:34:21 +0000 (01:34 +0200)
commit31409e07185e6daa5d12a893a31a5d8b61db3fcc
tree12df94dcd2705270a0f2d817af8b2add52b87aed
parent39f0cb8b8f26944c07f378beb887dcef1cdaa8aa
parent6d7c06a99061c03c31d8fe886ffd6b9ba8be2109
Merge branch 'MDL-59096-master' of https://github.com/sammarshallou/moodle