Merge branch 'wip-MDL-30336-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 08:04:30 +0000 (16:04 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 8 Dec 2011 08:04:30 +0000 (16:04 +0800)

Trivial merge