Merge branch 'MDL-29471' of git://github.com/mouneyrac/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 14 Feb 2012 03:36:53 +0000 (11:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 14 Feb 2012 03:36:53 +0000 (11:36 +0800)

Trivial merge