Merge branch 'MDL-29115' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:53:24 +0000 (11:53 +1300)
committerSam Hemelryk <sam@moodle.com>
Thu, 24 Nov 2011 22:53:24 +0000 (11:53 +1300)

Trivial merge