Merge branch 'MDL-31495-master' of git://github.com/micaherne/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 14 Feb 2012 03:56:25 +0000 (11:56 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 14 Feb 2012 03:56:25 +0000 (11:56 +0800)

Trivial merge