Merge branch 'MDL-54916-31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE
commit49e291c7a6d23e8d9ddecad376a0f02f20c52de8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Nov 2016 15:20:09 +0000 (7 16:20 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 Nov 2016 15:20:09 +0000 (7 16:20 +0100)
treeab8f9f338c648562513a1ce85c796b3742387952
parentff6af70f81ad58fda011f0817e811eff18287a31
parent533addff9c049bb94bc23e6f95ec3289f3917396
Merge branch 'MDL-54916-31' of https://github.com/mr-russ/moodle into MOODLE_31_STABLE