Merge branch 'ff/netlib' into ja/zeromq
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 6 Nov 2010 11:15:52 +0000 (12:15 +0100)
1  2 
configure.in
src/Makefile.am
src/collectd.conf.in
src/collectd.conf.pod

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge
Simple merge
Simple merge