Merge branch 'MDL-57727-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commit0829f912149ddc7e3d2ed1c28ba41df6690483a8
authorDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:34:05 +0000 (2 12:34 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 2 Jan 2018 11:34:05 +0000 (2 12:34 +0100)
tree2267081b40bfea51f0f69c94cd60ae3f90a4752f
parentae02647dec0222c4516ab3f6b2e497bd336b26f2
parente96e4d5a5be06e41fdeaa09c2e3378c181410ae7
Merge branch 'MDL-57727-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE