Merge branch 'wip-mdl-33143' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 23 May 2012 08:44:00 +0000 (16:44 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 23 May 2012 08:44:00 +0000 (16:44 +0800)

Trivial merge