From: Dan Poltawski <dan@moodle.com>
Date: Mon, 4 Nov 2013 09:21:29 +0000 (+0800)
Subject: Merge branch '42350-26' of git://github.com/samhemelryk/moodle
X-Git-Tag: v2.6.0-rc1~159
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=81da82f5f3199541ad1e0ab910bae1a0ce1cb516

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

81da82f5f3199541ad1e0ab910bae1a0ce1cb516