Merge branch 'MDL-23887-master-2' of https://github.com/snake/moodle
commitff9a93a8b64babf301d3adb3e6a04865d4a8322f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:41 +0000 (3 00:24 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Jan 2018 23:24:41 +0000 (3 00:24 +0100)
treeeaf21988cca6871677fa132ff14bc8f226c6c77e
parente3cd0dfc2c6bfd619437493269e9b50b2ec17828
parentfa2a9cc9339e5c2ce59b3684fcddcac17be213f6
Merge branch 'MDL-23887-master-2' of https://github.com/snake/moodle