From: David Monllao <davidm@moodle.com>
Date: Thu, 19 May 2016 07:03:14 +0000 (+0800)
Subject: Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle
X-Git-Tag: v3.1.0-rc2~18
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=8af3e3abb266852fe0342277a81c2250d68e7911;hp=-c

Merge branch 'MDL-54630_master' of git://github.com/markn86/moodle
---

8af3e3abb266852fe0342277a81c2250d68e7911