From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 9 Jul 2013 05:26:49 +0000 (+0800)
Subject: Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
X-Git-Tag: v2.6.0-beta~1054
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=eb729e0391f56c909dc3cf8a76dfc9257091c145

Merge branch 'MDL-40499' of git://github.com/jmvedrine/moodle
---

eb729e0391f56c909dc3cf8a76dfc9257091c145