From: Sam Hemelryk <sam@moodle.com>
Date: Sun, 11 Aug 2013 23:02:48 +0000 (+1200)
Subject: Merge branch 'MDL-31487' of git://github.com/timhunt/moodle
X-Git-Tag: v2.6.0-beta~732
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=61bec33f53704994cb750d65ba48ebf0bc381418;hp=-c

Merge branch 'MDL-31487' of git://github.com/timhunt/moodle
---

61bec33f53704994cb750d65ba48ebf0bc381418