From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 8 Oct 2013 05:47:49 +0000 (+0800)
Subject: Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle
X-Git-Tag: v2.6.0-beta~119
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=43822d89c58653d73101ebeb9af3a213757ae29c

Merge branch 'MDL-32570-master' of git://github.com/danpoltawski/moodle
---

43822d89c58653d73101ebeb9af3a213757ae29c