Merge branch 'MDL-30601' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:30:41 +0000 (10:30 +1300)
committerSam Hemelryk <sam@moodle.com>
Mon, 2 Jan 2012 21:30:41 +0000 (10:30 +1300)

Trivial merge