Merge branch 'MDL-26257' of git://github.com/bostelm/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 11:07:22 +0000 (19:07 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Sep 2011 11:07:22 +0000 (19:07 +0800)

Trivial merge