Merge branch 'MDL-61204-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE
commit16ab239fb46dd22d030e6f0f10eeb51e1af80574
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:17:39 +0000 (16 02:17 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:17:39 +0000 (16 02:17 +0100)
treeb425b222b8cc9858ecdc90bb13062194cddfb5d1
parentf41a17331714b7dd95425ad979bffa1cc74c002a
parent4940aa51521f69dd5b2e23fe9949b2da190d6b66
Merge branch 'MDL-61204-31' of git://github.com/andrewnicols/moodle into MOODLE_31_STABLE