Merge branch 'MDL-30627-master-1' of git://git.luns.net.uk/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 20 Dec 2011 05:38:21 +0000 (13:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 20 Dec 2011 05:38:21 +0000 (13:38 +0800)

Trivial merge