Merge branch 'wip-mdl-30560' of git://github.com/rajeshtaneja/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 07:51:27 +0000 (15:51 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 07:51:27 +0000 (15:51 +0800)

Trivial merge