Merge branch 'MDL-61622-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
commitd2c04300f3720782bdddd46f239e3e59dbbc0238
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 10:37:16 +0000 (12 11:37 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 12 Mar 2018 10:37:16 +0000 (12 11:37 +0100)
treece755e21479fe72719e707418d2784ab13d5e4a2
parent0534fbc2aae802aa4eef1733a8f2ea46abe02754
parent7fe0a3b051b9039db1624ddb73aa39dcc9db8539
Merge branch 'MDL-61622-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE