Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 07:48:48 +0000 (08:48 +0100)
committerDavid Monllao <davidm@moodle.com>
Thu, 9 Nov 2017 07:48:48 +0000 (08:48 +0100)
commit7fdcdc04ff3e1a839f2f9579340e84729fbf00a2
tree852e20eaf3e6f99eb2b3e8417b0f3a00e02b623e
parentbef5a8ca10ded3a4adcd66a4f54495a9e61e1c1e
parent246698e77946f9e14db1ad043fd60335f3d843ca
Merge branch 'MDL-60615-master' of git://github.com/damyon/moodle