Merge branch 'wip-mdl-27120' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 May 2012 06:22:34 +0000 (14:22 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 May 2012 06:22:34 +0000 (14:22 +0800)

Trivial merge