Merge branch 'wip-MDL-48228-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE
commita7db91030bd2366a66025af0f7796b4a10d5d61c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 01:57:16 +0000 (1 02:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Mar 2017 01:57:16 +0000 (1 02:57 +0100)
tree2d0ff6b4844ea478f6e4b77a82bfe9ba5f8dcbbc
parente44ce23c9f4893d173cc6f0bef21e71691801747
parentd807d3c603f13834db5f9dfe658b852856459a6e
Merge branch 'wip-MDL-48228-32' of git://github.com/abgreeve/moodle into MOODLE_32_STABLE