Merge branch 'MDL-61321-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
commit6dcb3a16924bb077e3976af9e0745ba0064a5f05
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 10:45:20 +0000 (27 12:45 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 27 Mar 2018 10:45:20 +0000 (27 12:45 +0200)
tree762adfa9486ceac8a64d19b4ba0b0fad2ae0d680
parentb2970055de1c9078cb03f0eb73fc76f13f29423c
parent48dfcbe27b20ec15b62a2e4e7bd6c170080be1c7
Merge branch 'MDL-61321-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE