Merge branch 'MDL-60942-master' of git://github.com/ryanwyllie/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 26 Dec 2017 08:44:44 +0000 (09:44 +0100)
committerDavid Monllao <davidm@moodle.com>
Wed, 27 Dec 2017 16:54:54 +0000 (17:54 +0100)
commit3410ff644fdac6c5c67de76268f9e31066e81822
treeeef50d7335e1a0247687c8109c6aaf049e51e77d
parent41d14d5ca427f6459742336dafd25715d7f5e683
parent748545858c39b981591ca1c96be898b6be4f7377
Merge branch 'MDL-60942-master' of git://github.com/ryanwyllie/moodle