Merge branch 'wip-MDL-24200-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 9 Nov 2011 03:05:32 +0000 (11:05 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 9 Nov 2011 03:05:32 +0000 (11:05 +0800)

Trivial merge