Merge branch 'MDL-23887-33-2' of https://github.com/snake/moodle into MOODLE_33_STABLE
commitc2155bef1965a28da6dc0787bab7feb894f6ef28
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:25:42 +0000 (3 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:25:42 +0000 (3 00:25 +0100)
tree517f80b6cf07edd709c12da157a67883a05dd9e3
parent0829f912149ddc7e3d2ed1c28ba41df6690483a8
parent7ec58e84b09dd9076d71d565d1bbdd4277e2c9ba
Merge branch 'MDL-23887-33-2' of https://github.com/snake/moodle into MOODLE_33_STABLE