Merge branch 'MDL-32087' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 17 May 2012 09:17:37 +0000 (17:17 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 17 May 2012 09:17:37 +0000 (17:17 +0800)

Trivial merge