Merge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 3 May 2012 03:33:55 +0000 (11:33 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 3 May 2012 03:33:55 +0000 (11:33 +0800)

Trivial merge