Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2016 16:58:51 +0000 (17:58 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 1 Dec 2016 16:58:51 +0000 (17:58 +0100)
commitf200f74552eb3f3ba883c32bae878e14a931e750
tree4f7aec0d288c33ac568916351c80d5cc7e9470d4
parent063d5c28cf2b75a250abe7bd6231235b0217e07b
parent6c45e525fccd0be87f1b335e8349b0b857de6b78
Merge branch 'wip-MDL-57234-master' of https://github.com/Beedell/moodle