Merge branch 'MDL-3054' of git://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 05:38:49 +0000 (13:38 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 05:38:49 +0000 (13:38 +0800)

Trivial merge