Merge branch 'MDL-29818-master' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 03:36:07 +0000 (11:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 03:36:07 +0000 (11:36 +0800)

Trivial merge