Merge branch 'MDL-61348-take2_33' of git://github.com/timhunt/moodle into MOODLE_33_S...
commita5ca61930d0354df817b9d7696dbbcdfcee750e7
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:02:15 +0000 (20 02:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:02:15 +0000 (20 02:02 +0200)
treec355d71d8d2d1568a8f0aacd0fe95f17afc9f4f5
parentb71fc4ce4b08d8c0d3d63011e0956b98bbbc9789
parent24d2357da75ef97d0c73346966302e69878c552e
Merge branch 'MDL-61348-take2_33' of git://github.com/timhunt/moodle into MOODLE_33_STABLE