From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 8 Aug 2011 06:22:51 +0000 (+0800)
Subject: Merge branch 'mdl-28517' of git://github.com/colchambers/moodle
X-Git-Tag: v2.2.0-beta~576
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=e97584bcf1075485fa043d28830fc97cc6f17001

Merge branch 'mdl-28517' of git://github.com/colchambers/moodle
---

e97584bcf1075485fa043d28830fc97cc6f17001