Merge branch 'MDL-33683-master-2' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 11:36:22 +0000 (19:36 +0800)
committerAparup Banerjee <aparup@moodle.com>
Wed, 20 Jun 2012 11:36:22 +0000 (19:36 +0800)

Trivial merge