Merge branch 'wip-MDL-31072-master' of github.com:marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 03:39:05 +0000 (11:39 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 16 Jan 2012 03:39:05 +0000 (11:39 +0800)

Trivial merge