Merge branch 'MDL-61055-34-v2' of git://github.com/lameze/moodle into MOODLE_34_STABLE
commitc7a1ecd9f696b8a6f9b407ee4241f6822c66e21d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:45:52 +0000 (26 00:45 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:45:52 +0000 (26 00:45 +0100)
tree44c1a987c2aed94d4e248c254a000e63fba1d2e1
parent829adb5f211aa6951d6f45ec3f1d3dbb556bab6b
parentbc121625c33b71a1f746cbfaf0307d147278ce8f
Merge branch 'MDL-61055-34-v2' of git://github.com/lameze/moodle into MOODLE_34_STABLE