Merge branch 'w03_MDL-31170_m23_blogblocks' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 23:55:31 +0000 (00:55 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 16 Jan 2012 23:55:31 +0000 (00:55 +0100)

Trivial merge