Merge branch 'wip-MDL-30289-master' of git://github.com/abgreeve/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 05:57:34 +0000 (13:57 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 21 Nov 2011 05:57:34 +0000 (13:57 +0800)

Trivial merge