Merge branch 'MDL-29226' of git://github.com/lazydaisy/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 24 Nov 2011 06:39:53 +0000 (14:39 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 24 Nov 2011 06:39:53 +0000 (14:39 +0800)

Trivial merge