Merge branch 'wip-mdl-30817' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Mar 2012 03:45:28 +0000 (11:45 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Mar 2012 03:45:28 +0000 (11:45 +0800)

Trivial merge