Code

Merge branch 'collectd-4.10'
authorFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:25:04 +0000 (09:25 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Mon, 3 May 2010 07:25:04 +0000 (09:25 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge