Merge branch 'MDL-60882-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
commit46895a7b3dde1cd2846c4eec5f51d73489d6c0d9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:39:05 +0000 (27 01:39 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 23:39:05 +0000 (27 01:39 +0200)
tree3652e54040f804766921e4da15c4fa00e68221f1
parent520cc4e6612e7759a7b62850087f7a3c477addf3
parentb4665dba288849260b29d487b860c7b164b43c25
Merge branch 'MDL-60882-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE