Merge branch 'MDL-53803_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_S...
commitd5b38dfea1ca83027c4a254b2e4111d13b152ab5
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 16:02:59 +0000 (12 18:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jul 2016 16:02:59 +0000 (12 18:02 +0200)
tree0fd0e96e67d66af9864bd3e887e4d4b8358a59b5
parent19b118ad4223d4cc171a0e6e9a3a4346ce448004
parent10120241ae91e89468de2305f27b950398114aaa
Merge branch 'MDL-53803_m31v1' of https://github.com/sbourget/moodle into MOODLE_31_STABLE