From: Dan Poltawski <dan@moodle.com>
Date: Wed, 9 Oct 2013 08:28:53 +0000 (+0800)
Subject: Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
X-Git-Tag: v2.6.0-beta~88
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=bbe834a152bd00b2a0657e276e20f2ee85b5371c

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

bbe834a152bd00b2a0657e276e20f2ee85b5371c