Merge branch 'w05_MDL-26104_20_blockconflick' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:02:51 +0000 (16:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 31 Jan 2011 15:02:51 +0000 (16:02 +0100)

Trivial merge