Merge branch 'MDL-30137' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:37:59 +0000 (11:37 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 8 Nov 2011 03:37:59 +0000 (11:37 +0800)

Trivial merge