From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 09:47:30 +0000 (+0800)
Subject: Merge branch 'MDL-26178' of git://github.com/timhunt/moodle
X-Git-Tag: v2.0.2~137
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=2b1f6ced64216b30489aa4e898583f93a39e3061

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

2b1f6ced64216b30489aa4e898583f93a39e3061