Merge branch 'MDL-61570-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit9e21adb5f722d627c5c73fcb4313784c7d09ad01
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 16 Mar 2018 00:15:35 +0000 (16 01:15 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 16 Mar 2018 00:15:35 +0000 (16 01:15 +0100)
tree82e81e6608bc5e4a5acf73c64e56da6dc2c05a01
parent92be49df4957185e3f8b18264e5130e0c9667f98
parent65c23f097c49d3ba6a06a36c9fd45031b61a75fd
Merge branch 'MDL-61570-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE