Merge branch 'wip-mdl-32866' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 17 May 2012 08:48:07 +0000 (16:48 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 17 May 2012 08:48:07 +0000 (16:48 +0800)

Trivial merge