Merge branch 'MDL-30910' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 21:22:06 +0000 (10:22 +1300)
committerSam Hemelryk <sam@moodle.com>
Tue, 21 Feb 2012 21:22:06 +0000 (10:22 +1300)

Trivial merge