Merge branch 'MDL-30243' of git://github.com/lazydaisy/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 28 Nov 2011 06:33:57 +0000 (14:33 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 28 Nov 2011 06:33:57 +0000 (14:33 +0800)

Trivial merge