From: David Monllao <davidm@moodle.com>
Date: Wed, 11 May 2016 01:09:11 +0000 (+0800)
Subject: Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle
X-Git-Tag: v3.1.0-rc1~61
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=58a2f0ac40f24da9c9955110902f8e14cd0d8419;hp=-c

Merge branch 'MDL-54044-master' of git://github.com/FMCorz/moodle
---

58a2f0ac40f24da9c9955110902f8e14cd0d8419