From: Damyon Wiese <damyon@moodle.com>
Date: Tue, 19 Feb 2013 05:48:12 +0000 (+0800)
Subject: Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle
X-Git-Tag: v2.5.0-beta~491
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=1ec8da670689e135d5cef360f6d5ccaf8344392a

Merge branch 'wip-MDL-38000-m25' of git://github.com/samhemelryk/moodle
---

1ec8da670689e135d5cef360f6d5ccaf8344392a