From: David Monllao <david.monllao@gmail.com>
Date: Tue, 11 Jul 2017 10:36:58 +0000 (+0200)
Subject: Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle
X-Git-Tag: v3.4.0-beta~667
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=e78d7cc0b1f94d2725a89d9aaa5a401c38147e66;hp=--cc

Merge branch 'wip-MDL-59363-master' of git://github.com/marinaglancy/moodle
---

e78d7cc0b1f94d2725a89d9aaa5a401c38147e66