From: David Monllao <davidm@moodle.com>
Date: Tue, 1 Dec 2015 10:29:27 +0000 (+0800)
Subject: Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
X-Git-Tag: v3.1.0-beta~904
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=0ee52b8214eb70a546fb5d0fa7426bf2c8e99f1e

Merge branch 'MDL-51830-master' of git://github.com/lucisgit/moodle
---

0ee52b8214eb70a546fb5d0fa7426bf2c8e99f1e