Merge branch 'wip-MDL-27334-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 07:01:25 +0000 (15:01 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 30 Nov 2011 07:01:25 +0000 (15:01 +0800)

Trivial merge