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)
commit746a2c1d4d472f4eb86f88fe5b8a19f581eac451
tree3321fffb8a72876ec513b1140c71172b402bea5b
parentf7404b24fecd3afc7a64889842221e329e6982ca
parentcedb6f147e94d0e952449f731313412ef4d67904
Merge branch 'collectd-5.5'
configure.ac
src/daemon/configfile.c
src/tail.c
src/tail_csv.c