Merge branch 'wip-mdl-28580' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 22 Aug 2011 16:51:28 +0000 (00:51 +0800)

Trivial merge