Code

Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:26:13 +0000 (09:26 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Tue, 19 Aug 2008 07:26:13 +0000 (09:26 +0200)
1  2 
configure.in
src/Makefile.am

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