Merge branch 'MDL-27975' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 01:36:35 +0000 (13:36 +1200)
committerSam Hemelryk <sam@moodle.com>
Mon, 5 Sep 2011 01:36:35 +0000 (13:36 +1200)

Trivial merge