Merge branch 'MDL-29970' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 08:48:59 +0000 (16:48 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 08:48:59 +0000 (16:48 +0800)

Trivial merge