From: Dan Poltawski <dan@moodle.com>
Date: Fri, 8 Nov 2013 03:11:28 +0000 (+0800)
Subject: Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
X-Git-Tag: v2.6.0-rc1~79
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=379cbb459aa84c3970cba2098dd1ce78c3599ff7

Merge branch 'MDL-42704-master' of git://github.com/jamiepratt/moodle
---

379cbb459aa84c3970cba2098dd1ce78c3599ff7