Merge branch 'wip-mdl-28726' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Sep 2011 02:19:17 +0000 (10:19 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Sep 2011 02:19:17 +0000 (10:19 +0800)

Trivial merge