Merge branch 'MDL-60503-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE
commit46343f8cc2f385108f079134dbc1106d49c24a90
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 10:46:01 +0000 (1 11:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 1 Nov 2017 10:46:01 +0000 (1 11:46 +0100)
treee259d6df682389eb44d0b647782cc8fc94d94887
parent00d6486f73fdf12b1fa91554f72b81a48f45393f
parentbcedb11d9942c6f811e1a5b4c61247a369c8a4be
Merge branch 'MDL-60503-33' of git://github.com/damyon/moodle into MOODLE_33_STABLE