Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 22:57:27 +0000 (23:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:11:52 +0000 (00:11 +0100)
commit22c6affdef433cc60403ea63207c239db8848684
treef7ff0b3620a4cdda39c17738908ad90acced553b
parent73aa231f83a0af8970998967841cac435da57189
parent464ddd07d564868c71968b1c04f34105319a5515
Merge branch 'MDL-43466_master' of git://github.com/markn86/moodle