Merge branch 'MDL-31491_master' of git://github.com/kordan/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 7 Feb 2012 06:10:26 +0000 (14:10 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 7 Feb 2012 06:10:26 +0000 (14:10 +0800)

Trivial merge