Merge branch 'wip_m_MDL-29178_fix_block_naming_inconsistencies' of git://github.com...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 20:14:20 +0000 (21:14 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Feb 2012 20:14:20 +0000 (21:14 +0100)

Trivial merge