Merge branch 'MDL-31863' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 03:09:51 +0000 (11:09 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 12 Jun 2012 03:09:51 +0000 (11:09 +0800)

Trivial merge