Merge branch 'MDL-30395' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 06:04:14 +0000 (14:04 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 06:04:14 +0000 (14:04 +0800)

Trivial merge