Merge branch 'wip-MDL-28646' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 29 Nov 2011 08:38:02 +0000 (16:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 29 Nov 2011 08:38:02 +0000 (16:38 +0800)

Trivial merge