Merge branch 'master_MDL-29325' of git://github.com/danmarsden/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:59:22 +0000 (14:59 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 13 Dec 2011 06:59:22 +0000 (14:59 +0800)

Trivial merge