Merge branch 'wip-MDL-27278-master' of git://github.com/samhemelryk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 11 Oct 2011 03:19:14 +0000 (11:19 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 11 Oct 2011 03:19:14 +0000 (11:19 +0800)

Trivial merge