Merge branch 'MDL-60320_33' of git://github.com/aolley/moodle into MOODLE_33_STABLE
commit2d2e3dc0eb5f7317f4a7e49db2c45ca3ac9b49c3
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:06:03 +0000 (17 00:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Oct 2017 22:06:03 +0000 (17 00:06 +0200)
treedabd57a8cf3fa957c47376669f8dbec6df550748
parent2b5948200fef6dcf8603844122fe3ea99550a05b
parent3ff2f2d474d7e046a634fd354632a9e2092bcb9e
Merge branch 'MDL-60320_33' of git://github.com/aolley/moodle into MOODLE_33_STABLE