From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 08:20:51 +0000 (+0800)
Subject: Merge branch 'MDL-25637'
X-Git-Tag: v2.0.2~163
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=912d099cc94e40777b73b2412d12ffd95f79856d

Merge branch 'MDL-25637'
---

912d099cc94e40777b73b2412d12ffd95f79856d