Merge branch 'MDL-33442-master-integration' of git://github.com/FMCorz/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 13:29:45 +0000 (21:29 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 14 Jun 2012 13:29:45 +0000 (21:29 +0800)

Trivial merge