Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 19 Oct 2017 11:49:23 +0000 (13:49 +0200)
commiteef0ce917b2bd7be7dfc4f04b6abb587b7204149
tree9a009232caca69e22241a96b532f113ee2362a86
parent254c19e26f78987a5d078422ab82e582a5f0bd23
parent9a62cd02db0172f9dcff287365d285892b7e14ea
Merge branch 'MDL-60233-master' of git://github.com/jleyva/moodle