From: Andrew Nicols <andrew@nicols.co.uk>
Date: Tue, 28 Jun 2016 06:14:23 +0000 (+0800)
Subject: Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle
X-Git-Tag: v3.2.0-beta~949
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=628c52e4655175d82a65e8f85a672e60fdbc8bda

Merge branch 'MDL-54601-master' of git://github.com/jleyva/moodle
---

628c52e4655175d82a65e8f85a672e60fdbc8bda