Merge branch 'MDL-63439-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE
commit447b4bdf5a15c0fd71feea2c77ce5d8312482170
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:48:29 +0000 (10 00:48 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 9 Oct 2018 22:48:29 +0000 (10 00:48 +0200)
treed78896853f04d50a351dfb9f7aadae69464379ba
parent3d92367a8094f69729efc2b0b224ffeffde97184
parentf68ad5439b13b21f6155913cb9e627363288621f
Merge branch 'MDL-63439-34' of git://github.com/damyon/moodle into MOODLE_34_STABLE