Merge branch 'MDL-30428-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Fri, 25 Nov 2011 03:59:10 +0000 (11:59 +0800)
committerAparup Banerjee <aparup@moodle.com>
Fri, 25 Nov 2011 03:59:10 +0000 (11:59 +0800)

Trivial merge