Merge branch 'MDL-26260' of git://github.com/timhunt/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 08:23:54 +0000 (16:23 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 30 Jan 2012 08:23:54 +0000 (16:23 +0800)

Trivial merge