Merge branch 'wip-MDL-17327-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 06:58:27 +0000 (14:58 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 06:58:27 +0000 (14:58 +0800)

Trivial merge