Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 12:57:29 +0000 (13:57 +0100)
commit278d000ffbd978fce52871a9f33f0cf5e1ce49b7
tree7650f5b852417e91299e07f93d9f3393731bf3d1
parent3e5c93f05cbea0639b8401b7a6e6f382ca6aad1f
parentdf724fee6b417cfbeea2925f4c6fd8c70f9a7d66
Merge branch 'collectd-4.1' of octo@verplant.org:/var/lib/git/collectd into collectd-4.1