Merge branch 'wip-MDL-31224-m23' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 24 Jan 2012 14:57:24 +0000 (22:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 24 Jan 2012 14:57:24 +0000 (22:57 +0800)

Trivial merge