Merge branch 'MDL-48501-mdl32' of git://github.com/jswebster/moodle into MOODLE_32_STABLE
commit9538e66f1be00588bc8aa237801337e90d2ab0d6
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 22:51:19 +0000 (12 23:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 22:51:19 +0000 (12 23:51 +0100)
tree41c0e419e302e910b90ef81a01d14701442b0a5b
parent41a39d24e1a7c426b101a01c9fb28a9b1e4fc699
parent0fc009e6a6c688fe4f98177c78e892a2e10530e2
Merge branch 'MDL-48501-mdl32' of git://github.com/jswebster/moodle into MOODLE_32_STABLE