Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:00:27 +0000 (11:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 24 Jan 2011 03:00:27 +0000 (11:00 +0800)
commit88c3ba8c06616696e104b188360ebe901d7e69b9
tree447e56641ea5fa09c800b93735c0b4874d815c66
parentf8b214e1cde48ae1d02798a9ab387981ee0a2158
parenta915dedb2ac399f70b2b3f75acd3ee924617b1ea
Merge branch 'w04_MDL-26041_20_resources' of git://github.com/skodak/moodle