From: David Monllao <davidm@moodle.com>
Date: Tue, 6 Oct 2015 02:19:02 +0000 (+0800)
Subject: Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle
X-Git-Tag: v3.0.0-beta~161
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=7da61f95ce3edc9cc0d03198ffe47ffa10672687

Merge branch 'MDL-49811_master' of git://github.com/jinhofer/moodle
---

7da61f95ce3edc9cc0d03198ffe47ffa10672687