Merge branch 'MDL-31837' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 09:03:55 +0000 (17:03 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 28 Aug 2012 09:03:55 +0000 (17:03 +0800)

Trivial merge