Merge branch 'pull/master'
authorFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
committerFlorian octo Forster <octo@dev4.office.noris.de>
Wed, 27 Feb 2008 09:24:03 +0000 (10:24 +0100)
commitfb475b66fb27f1c06f1d4ecfc910ccbd36216a41
treedb2055228ca099597bc093e99c510ed1d2e09e9c
parent7596ace468a248d4c77b769d75147ada2c2111da
parent22b70372976569e5763816bbdb8a5011f9f8226b
Merge branch 'pull/master'
src/collectd.c