Merge branch 'MDL-56220-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE
commitf029c8fd93e2a6b243be56dceb9b4485f5195291
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:18:35 +0000 (11 01:18 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 10 Oct 2016 23:18:35 +0000 (11 01:18 +0200)
tree6fad7abb01be966b9faff44d7c922a82d083cdab
parent84f5f4706f22d14d21ce053330e681e85e700e54
parentd0f145c0d5d61be69b75199853b17ebf02e4b34f
Merge branch 'MDL-56220-m31' of https://github.com/micaherne/moodle into MOODLE_31_STABLE