Merge branch 'MDL-59741-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE
commit14b7a15960dfe2f0db6e962ec35b8f456e267927
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:36:51 +0000 (14 02:36 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Aug 2017 00:36:51 +0000 (14 02:36 +0200)
treefd1d4538a5aefa6b41dc2a5ccfebc03e0f592166
parent65097503ac17dbd97614298ea7800467c43e4c7a
parentc7ebab972589c9b776496c2b71d34ecefb010837
Merge branch 'MDL-59741-33' of git://github.com/jleyva/moodle into MOODLE_33_STABLE