Merge branch 'wip-mdl-29396' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 08:08:57 +0000 (16:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 08:08:57 +0000 (16:08 +0800)

Trivial merge