Merge branch 'MDL-31319' of git://github.com/mackensen/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 07:01:53 +0000 (15:01 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 07:01:53 +0000 (15:01 +0800)

Trivial merge