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)

Trivial merge