Merge branch 'MDL-61998-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE
commit87aaec6c82911899fbf50bdb09271028c4616603
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:40:18 +0000 (26 02:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:40:18 +0000 (26 02:40 +0200)
tree9c9d05452843aec7c99dab2d450f7dffdfdb44d7
parent08339c279943f63ca79a0f2d0d18f81b24fba1f8
parent54f5ded42056998397a22e9cafe1ff67f3e7c633
Merge branch 'MDL-61998-33' of git://github.com/sarjona/moodle into MOODLE_33_STABLE