Merge branch 'MDL-30911' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 04:41:55 +0000 (17:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 14 Feb 2012 04:41:55 +0000 (17:41 +1300)

Trivial merge