Merge branch 'MDL-34967' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 12 Sep 2012 06:26:34 +0000 (14:26 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 12 Sep 2012 06:26:34 +0000 (14:26 +0800)

Trivial merge