Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 13:54:41 +0000 (14:54 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 13:54:41 +0000 (14:54 +0100)
commit8cf1acdb96d027b1d48c9dfb74fea313e63ceedf
treee1d64634381950136c9cd54eb24f961bc6add864
parentff4ebc0fd3c93a39a18edc629d61787f60a92706
parentf6201a71ce5b80c052582e002564ae090e56b997
Merge branch 'collectd-4.1' into collectd-4.2
src/collectd-unixsock.pod