Merge branch 'MDL-30463' of git://github.com/rwijaya/moodle
authorSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 01:26:42 +0000 (14:26 +1300)
committerSam Hemelryk <sam@moodle.com>
Wed, 14 Dec 2011 01:26:42 +0000 (14:26 +1300)

Trivial merge