Merge branch 'MDL-29542' of git://github.com/rwijaya/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 09:05:17 +0000 (17:05 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 09:05:17 +0000 (17:05 +0800)

Trivial merge