Merge branch 'MDL-31407' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 03:25:44 +0000 (11:25 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 8 Feb 2012 03:25:44 +0000 (11:25 +0800)

Trivial merge