Merge branch 'MDL-62394-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commitf6636c4ef68787b4f0ea810e3a47638fee5c8b83
authorJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:25 +0000 (11 14:23 +0800)
committerJun Pataleta <jun@moodle.com>
Fri, 11 May 2018 06:23:25 +0000 (11 14:23 +0800)
treec2b1e74f587ad34ed13ffb49b3da3e77435d60cc
parentc0e4458f2829bc58c2b888f5ed6ae0c2497f19a7
parent348bdcba709ad8dfbe75dccce4ab114b19a272f7
Merge branch 'MDL-62394-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE