Merge branch 'wip-MDL-32171-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 03:42:58 +0000 (11:42 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 3 Apr 2012 03:42:58 +0000 (11:42 +0800)

Trivial merge