Merge branch 'collectd-4.2'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 13:54:54 +0000 (14:54 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 13:54:54 +0000 (14:54 +0100)
1  2 
src/collectd-unixsock.pod
src/common.h

Simple merge
diff --cc src/common.h
Simple merge