Merge branch 'MDL-43827-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE
commit02d16e76c32a373323ef6f437e053a72bd53d92b
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:48 +0000 (26 00:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 25 Dec 2017 23:25:48 +0000 (26 00:25 +0100)
treee241e14cf09321915ddb99af310f7bf54e3b5152
parentf46f4ca56d7fab63c8eea9face37d6dbc4e2ca79
parentc2ebe33f774401101e6a20d96331fe039e72c9c6
Merge branch 'MDL-43827-33' of git://github.com/mihailges/moodle into MOODLE_33_STABLE