Merge branch 'wip-mdl-31654' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Mar 2012 05:22:01 +0000 (13:22 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Mar 2012 05:22:01 +0000 (13:22 +0800)

Trivial merge