Merge branch 'MDL-31392' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 06:24:31 +0000 (14:24 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 06:24:31 +0000 (14:24 +0800)

Trivial merge