Merge branch 'MDL-31469' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 7 Feb 2012 07:11:43 +0000 (15:11 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 7 Feb 2012 07:11:43 +0000 (15:11 +0800)

Trivial merge