Merge branch 'MDL-29955' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:41:31 +0000 (11:41 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 6 Nov 2011 22:41:31 +0000 (11:41 +1300)

Trivial merge