Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:25:46 +0000 (09:25 +0200)
commitc146aa8a58c370ced66a869a49028232b6bd9bdf
tree459aa8a977036258d84c196206cd4b5ad9c7dd67
parentaac435a16a547dd0a7621d0cda75b2918b24b515
parente2004cdfb5c19647c3fc35f1322a5990cf04a8c8
Merge branch 'collectd-4.3' of /var/lib/git/collectd into collectd-4.3