From: Eloy Lafuente (stronk7) <stronk7@moodle.org>
Date: Tue, 12 Jul 2016 15:51:36 +0000 (+0200)
Subject: Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle
X-Git-Tag: v3.2.0-beta~838
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=4a132893e0136feb38331d223a322728a4f8beb4

Merge branch 'MDL-54892-master' of https://github.com/tobiasreischmann/moodle
---

4a132893e0136feb38331d223a322728a4f8beb4