From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 16 Jul 2013 13:29:58 +0000 (+0800)
Subject: Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle
X-Git-Tag: v2.6.0-beta~958
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=b30a12db52b2060427b57746362f7ac08f76c127

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

b30a12db52b2060427b57746362f7ac08f76c127