Merge branch 'wip-MDL-35850-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 16 Oct 2012 03:08:01 +0000 (11:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 16 Oct 2012 03:08:01 +0000 (11:08 +0800)

Trivial merge