Code

Merge branch 'pyr/riemann'
authorFlorian Forster <octo@collectd.org>
Mon, 21 Jan 2013 10:10:55 +0000 (11:10 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 21 Jan 2013 10:10:58 +0000 (11:10 +0100)
Resolves Github issue #221.

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