Merge branch 'MDL-20501' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 06:04:22 +0000 (14:04 +0800)
committerSam Hemelryk <sam@moodle.com>
Wed, 10 Aug 2011 06:04:22 +0000 (14:04 +0800)

Trivial merge