projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 602d70a 8eac3d8)
Merge branch 'collectd-4.4' into collectd-4.5
authorFlorian Forster <octo@crystal.wlan.home.verplant.org>
Tue, 30 Dec 2008 16:24:06 +0000 (17:24 +0100)
committerFlorian Forster <octo@crystal.wlan.home.verplant.org>
Tue, 30 Dec 2008 16:24:06 +0000 (17:24 +0100)
Conflicts:

src/network.c


Trivial merge
collectd, the system statistics collection daemon