Merge branch 'MDL-25823' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:10:00 +0000 (13:10 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 8 Nov 2011 00:10:00 +0000 (13:10 +1300)

Trivial merge