Merge branch 'MDL-31863' of git://github.com/nebgor/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 7 Jun 2012 03:59:13 +0000 (11:59 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 7 Jun 2012 03:59:13 +0000 (11:59 +0800)

Trivial merge