From: Dan Poltawski <dan@moodle.com>
Date: Wed, 9 Oct 2013 23:20:18 +0000 (+0800)
Subject: Merge branch '42057-26' of git://github.com/samhemelryk/moodle
X-Git-Tag: v2.6.0-beta~79
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c08f914799217c8735aa40f4fc0990c2dbd2a682

Merge branch '42057-26' of git://github.com/samhemelryk/moodle
---

c08f914799217c8735aa40f4fc0990c2dbd2a682