Merge branch 'MDL-33184-master' of https://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 May 2012 07:18:59 +0000 (15:18 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 May 2012 07:18:59 +0000 (15:18 +0800)

Trivial merge