From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Mon, 12 Jun 2017 23:21:35 +0000 (+0200)
Subject: Merge branch 'mdl58161-master' of https://github.com/tlock/moodle
X-Git-Tag: v3.4.0-beta~807
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=8a55a41f88dd11f12b83d1181c439d72290c9e6d;hp=8a55a41f88dd11f12b83d1181c439d72290c9e6d

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