Merge branch 'MDL-31428' of git://github.com/stronk7/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 31 Jan 2012 03:15:26 +0000 (11:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 31 Jan 2012 03:15:26 +0000 (11:15 +0800)

Trivial merge