Merge branch 'MDL-30989' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 15 Feb 2012 02:32:16 +0000 (15:32 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 15 Feb 2012 02:32:16 +0000 (15:32 +1300)

Trivial merge