Merge branch 'MDL-31556' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 23:39:12 +0000 (12:39 +1300)
committerSam Hemelryk <sam@moodle.com>
Sun, 19 Feb 2012 23:39:12 +0000 (12:39 +1300)

Trivial merge