From: Damyon Wiese <damyon@moodle.com>
Date: Mon, 8 Jul 2013 14:28:21 +0000 (+0800)
Subject: Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle
X-Git-Tag: v2.6.0-beta~1066
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=15b726d584e77bc7279195c338f824b2e6bad924

Merge branch 'MDL-40561-master' of git://github.com/FMCorz/moodle
---

15b726d584e77bc7279195c338f824b2e6bad924