From: Damyon Wiese <damyon@moodle.com>
Date: Wed, 15 Oct 2014 05:58:32 +0000 (+0800)
Subject: Merge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle
X-Git-Tag: v2.8.0-rc1~267
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=b51c2c4f8c322793d6e4a4f75be3cdd3e8b7a742

Merge branch 'wip-MDL-47572-master' of git://github.com/marinaglancy/moodle
---

b51c2c4f8c322793d6e4a4f75be3cdd3e8b7a742