Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle
commit00045100d00e393eab24e7a9eed47c5f7a71304a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:42:17 +0000 (19 01:42 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Sep 2017 23:42:17 +0000 (19 01:42 +0200)
treea05bc23b7c1f2c2e019dcac0da49ef677350316a
parent0238520084a354937aed9c52bca30eb948fdd5e8
parent477ab6f808c2fb70ce0f0fecc7776b276715c792
Merge branch 'MDL-53244_master' of git://github.com/Chocolate-lightning/moodle