Merge branch 'wip-mdl-37339' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 22 Jan 2013 08:28:31 +0000 (16:28 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 22 Jan 2013 08:28:31 +0000 (16:28 +0800)

Trivial merge