Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 21:07:05 +0000 (23:07 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Sep 2017 21:07:05 +0000 (23:07 +0200)
commite03484eec5962cb32af541304fdcdfa569a4a3e5
treeb0b1d2aa045e43c17ca2c3dee8e6a21317c1ef3e
parent3f96ff0505d58c3e805eb64ccffb9fdc3fd02997
parentabf00dad41ffb9e80733b6e3d507b399ccb7424e
Merge branch 'MDL-59940-master' of git://github.com/andrewnicols/moodle