Merge branch 'wip-MDL-28352-master' of git://github.com/marinaglancy/moodle
authorAparup Banerjee <aparup@moodle.com>
Mon, 23 Jan 2012 23:15:15 +0000 (07:15 +0800)
committerAparup Banerjee <aparup@moodle.com>
Mon, 23 Jan 2012 23:15:15 +0000 (07:15 +0800)

Trivial merge