Merge branch 'MDL-29828' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 08:39:17 +0000 (16:39 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 08:39:17 +0000 (16:39 +0800)

Trivial merge