Merge branch 'wip-MDL-32081-m23' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 08:08:18 +0000 (16:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 08:08:18 +0000 (16:08 +0800)

Trivial merge