From: Jun Pataleta <jun@moodle.com>
Date: Thu, 19 Oct 2017 00:22:01 +0000 (+1300)
Subject: Merge branch 'mdl59843-master' of https://github.com/tlock/moodle
X-Git-Tag: v3.4.0-beta~62
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=2fbb83f6add4bda9c97cf4f0940bc5717293fa8f

Merge branch 'mdl59843-master' of https://github.com/tlock/moodle
---

2fbb83f6add4bda9c97cf4f0940bc5717293fa8f