Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 13:38:02 +0000 (14:38 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 14 Feb 2011 13:38:02 +0000 (14:38 +0100)
commitf0e28c7e67fec3ec88b57cc0ba4c2c2cb5d77089
treea5c8c3c55eb13b626717f42079b0e6fa267e216d
parenta49d8aa25ae732b614dbe82029a6e66e28ba0ec5
parent9c14c1c55b8def5f4e939a2e34a2c8e814d73b87
Merge branch 'w07_MDL-26223_20_calblock' of git://github.com/skodak/moodle