Merge branch 'MDL-33040-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 07:11:25 +0000 (15:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 31 May 2012 07:20:53 +0000 (15:20 +0800)

Trivial merge