Code

Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 06:50:27 +0000 (07:50 +0100)
committerFlorian Forster <octo@collectd.org>
Thu, 11 Jun 2015 06:50:27 +0000 (07:50 +0100)
1  2 
configure.ac
src/daemon/configfile.c
src/tail.c
src/tail_csv.c

diff --cc configure.ac
Simple merge
Simple merge
diff --cc src/tail.c
Simple merge
diff --cc src/tail_csv.c
Simple merge