Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:31:50 +0000 (12:31 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 11:31:50 +0000 (12:31 +0100)
commit222a500b314e02449090c693c7636033ee431446
treefa42e60dc65fe539343e1707064d606a0d97cc9f
parenta8759c65e46876ff102d1ea6d87882f709221ec2
parentb3929ae981a0ea5506a840234ba9804d3d90c83e
Merge branch 'w07_MDL-26383_20_blogupg' of git://github.com/skodak/moodle