Merge branch 'MDL-27635' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 02:38:45 +0000 (14:38 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 12 Sep 2011 02:38:45 +0000 (14:38 +1200)

Trivial merge