Merge branch 'MDL-61098-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE
commitfa4274319d45ba0f3bc3c0df7b3f7adb7ed7a937
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:34 +0000 (8 21:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 20:06:34 +0000 (8 21:06 +0100)
tree759cb762d2edbe046403a77270e6a2c1e4aa57ef
parent06c5a9e6ffc55e306c691dc400e7c7a92d7d9c05
parent5ed65e12e14ab378d1500586219c401e5a831183
Merge branch 'MDL-61098-34' of git://github.com/jleyva/moodle into MOODLE_34_STABLE