Merge branch 'MDL-32464' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 08:53:41 +0000 (16:53 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 08:53:41 +0000 (16:53 +0800)

Trivial merge