Merge branch 'MDL-28689' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 04:03:04 +0000 (16:03 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 04:03:04 +0000 (16:03 +1200)

Trivial merge