Merge branch 'MDL-30641-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Dec 2011 03:54:23 +0000 (11:54 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Dec 2011 03:54:23 +0000 (11:54 +0800)

Trivial merge