Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:09:55 +0000 (12:09 +0200)
committerFlorian Forster <octo@collectd.org>
Mon, 13 Jul 2015 10:09:55 +0000 (12:09 +0200)
1  2 
src/varnish.c

diff --cc src/varnish.c
Simple merge