From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 7 Jan 2014 04:53:07 +0000 (+0800)
Subject: Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v2.7.0-beta~796
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=778c03ccb1fea2e5026ab4b950789c848ddb0290

Merge branch 'MDL-43411-master' of git://github.com/andrewnicols/moodle
---

778c03ccb1fea2e5026ab4b950789c848ddb0290