Merge branch 'MDL-29527' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 07:37:14 +0000 (15:37 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 24 Oct 2011 07:37:14 +0000 (15:37 +0800)

Trivial merge