From: Sam Hemelryk <sam@moodle.com>
Date: Mon, 24 Jan 2011 03:00:27 +0000 (+0800)
Subject: Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle
X-Git-Tag: v2.0.2~172
X-Git-Url: http://git.moodle.org/gw?p=moodle.git;a=commitdiff_plain;h=88c3ba8c06616696e104b188360ebe901d7e69b9

Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle
---

88c3ba8c06616696e104b188360ebe901d7e69b9