Merge branch 'MDL-29005' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 30 Aug 2011 03:07:38 +0000 (11:07 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 30 Aug 2011 03:07:38 +0000 (11:07 +0800)

Trivial merge