Merge branch 'MDL-33357-3' of git://github.com/epsd/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 04:11:07 +0000 (12:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 04:11:07 +0000 (12:11 +0800)

Trivial merge