From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 31 Jan 2011 05:17:26 +0000 (+0800)
Subject: Merge branch 'MDL-25723' of git://github.com/epsd/moodle
X-Git-Tag: v2.0.2~153
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=13b9fe035c62fd772212c2aa5477b96948961662

Merge branch 'MDL-25723' of git://github.com/epsd/moodle
---

13b9fe035c62fd772212c2aa5477b96948961662