Merge branch 'MDL-30559' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 04:02:05 +0000 (12:02 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 04:02:05 +0000 (12:02 +0800)

Trivial merge