Merge branch 'MDL-17884_m20' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 08:00:20 +0000 (16:00 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 08:00:20 +0000 (16:00 +0800)

Trivial merge