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

Trivial merge