Merge branch 'MDL-33140' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 06:15:19 +0000 (14:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 06:15:19 +0000 (14:15 +0800)

Trivial merge