Merge branch 'MDL-30185' of git://github.com/colchambers/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 08:26:29 +0000 (16:26 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 08:26:29 +0000 (16:26 +0800)

Trivial merge