From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 2 Dec 2013 07:16:12 +0000 (+0800)
Subject: Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
X-Git-Tag: v2.7.0-beta~1028
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=2a1e730eb3bb4271449819284f83d39b738c661a

Merge branch 'wip-MDL-39286-master' of git://github.com/ds125v/moodle
---

2a1e730eb3bb4271449819284f83d39b738c661a