Merge branch 'MDL-37585' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 22 Jan 2013 03:08:16 +0000 (11:08 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 22 Jan 2013 03:08:16 +0000 (11:08 +0800)

Trivial merge