Merge branch 'collectd-4.9' into collectd-4.10
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 6 Dec 2010 08:31:15 +0000 (09:31 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 6 Dec 2010 08:31:15 +0000 (09:31 +0100)
1  2 
configure.in
src/common.c

diff --cc configure.in
Simple merge
diff --cc src/common.c
Simple merge