Merge branch 'MDL-33729-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 06:28:05 +0000 (14:28 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 06:28:05 +0000 (14:28 +0800)

Trivial merge