Merge branch 'MDL-29983' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 1 Nov 2011 05:23:03 +0000 (13:23 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 1 Nov 2011 05:23:03 +0000 (13:23 +0800)

Trivial merge