Merge branch 'MDL-31143' of https://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 07:29:05 +0000 (15:29 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 07:29:05 +0000 (15:29 +0800)

Trivial merge