Merge branch 'MDL-28687' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 23 Aug 2011 18:24:08 +0000 (02:24 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 23 Aug 2011 18:24:08 +0000 (02:24 +0800)

Trivial merge