Merge branch 'MDL-25729_m20' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:54:27 +0000 (15:54 +0800)
committerSam Hemelryk <sam@moodle.com>
Mon, 17 Jan 2011 07:54:27 +0000 (15:54 +0800)

Trivial merge