From: Sam Hemelryk <sam@moodle.com>
Date: Wed, 21 Aug 2013 01:17:37 +0000 (+1200)
Subject: Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle
X-Git-Tag: v2.6.0-beta~616
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=c1613ed53ad966510884d51043f2dee138d6e682;hp=c1613ed53ad966510884d51043f2dee138d6e682

Merge branch 'wip-MDL-40830-master' of git://github.com/marinaglancy/moodle
---