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)
commit479932c13229bacc6c7568e59becd207dceb6750
tree2d0daf350cc6921131bb2e983eddd72c4ab9fb1e
parent325f3addf252c1acb57e61ce5cb62dd5c996cc41
parent00b9c582d8999353f4fb68633357914af3a70c3a
Merge branch 'w03_MDL-31170_m23_blogblocks' of git://github.com/skodak/moodle