Merge branch 'MDL-60836-master' of git://github.com/jleyva/moodle
commit5cce9a8fff20eba8988f62030ad7b2d40a964aa4
authorDavid Monllao <davidm@moodle.com>
Tue, 30 Jan 2018 17:00:13 +0000 (30 18:00 +0100)
committerJake Dallimore <jake@moodle.com>
Thu, 1 Feb 2018 02:33:18 +0000 (1 10:33 +0800)
tree8a405aa30d844249bb0e21fb4ca93e5941491889
parente57392fabee4550ab340e1ab080acc96811f2094
parente3c04bd98ad51c220685b8f464767cde81905903
Merge branch 'MDL-60836-master' of git://github.com/jleyva/moodle