Merge branch 'wip-MDL-32106-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Tue, 27 Mar 2012 02:10:05 +0000 (10:10 +0800)
committerAparup Banerjee <aparup@moodle.com>
Tue, 27 Mar 2012 02:10:05 +0000 (10:10 +0800)

Trivial merge