Merge branch 'w07_MDL-26131_20_collapsible' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 14:06:28 +0000 (15:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 14:06:28 +0000 (15:06 +0100)

Trivial merge