Merge branch 'wip-MDL-30482-master' of git://github.com/phalacee/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 03:11:47 +0000 (11:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 03:11:47 +0000 (11:11 +0800)

Trivial merge