Merge branch 'MDL-30397' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 09:16:27 +0000 (17:16 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 22 Nov 2011 09:16:27 +0000 (17:16 +0800)

Trivial merge