Merge branch 'wip-MDL-31417-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Thu, 9 Feb 2012 01:43:54 +0000 (09:43 +0800)
committerAparup Banerjee <aparup@moodle.com>
Thu, 9 Feb 2012 01:43:54 +0000 (09:43 +0800)

Trivial merge