Merge branch 'ff/netlib' into ja/zeromq

author Florian Forster <octo@leeloo.lan.home.verplant.org>

Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)

committer Florian Forster <octo@leeloo.lan.home.verplant.org>

Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
author Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
committer Florian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/collectd.conf.in
Simple merge
diff --cc src/collectd.conf.pod
Simple merge
author	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
committer	Florian Forster <octo@leeloo.lan.home.verplant.org>
	Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
		1	2
configure.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/collectd.conf.pod	patch \|	diff1 \|	diff2 \|	blob \| history