Merge branch 'MDL-60249-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
commit26a276cea14bddbf4afbca28d12d8bf318491ae7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:55 +0000 (28 00:48 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 27 Nov 2017 23:48:55 +0000 (28 00:48 +0100)
tree1c9f97e285cbef792c6d63266e98f45e1cc67ed8
parent3e2eb6293165036f37a2f32b3f43d297434322ab
parentd8a7c52ee616e41763086a8ec4dfc0b71380996a
Merge branch 'MDL-60249-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE