Merge branch 'MDL-44612-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE
commite9925ef60148e80362de0abdf2e7fc0e07397427
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Jan 2018 00:11:27 +0000 (30 01:11 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:34:37 +0000 (1 10:34 +0800)
treecf12b6a649329949c64df251bc4479c568ea6d63
parentd8aba73bb47c3a3469856868e5661565b4847d83
parenta5e434b97ea2b27fe2415729be3ae82138559ffb
Merge branch 'MDL-44612-33' of git://github.com/junpataleta/moodle into MOODLE_33_STABLE