Merge branch 'MDL-61307-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE
commit1b1b6313c03880477a3f581f5a83bb13e3630b35
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 02:27:53 +0000 (13 03:27 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 13 Mar 2018 02:27:53 +0000 (13 03:27 +0100)
tree6fb694747f2c2a9814b821dd8aea127d07482cec
parent0913f3314f7d5a39786ee136e9edff355e2d5bfa
parent674a9c859d753c3c4532cc0b33c5c4ee042c33b3
Merge branch 'MDL-61307-33' of git://github.com/andrewnicols/moodle into MOODLE_33_STABLE