Merge branch 'wip-mdl-29244' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 3 Oct 2011 05:57:48 +0000 (13:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 3 Oct 2011 05:57:48 +0000 (13:57 +0800)

Trivial merge