Merge branch 'wip-mdl-27790-modified' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 06:50:16 +0000 (14:50 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 06:50:16 +0000 (14:50 +0800)

Trivial merge