Merge branch 'MDL-32633' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 16 May 2012 07:59:07 +0000 (15:59 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 16 May 2012 07:59:07 +0000 (15:59 +0800)

Trivial merge