Merge branch 'document-varnish-instance-block' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)
committerFlorian Forster <octo@collectd.org>
Sat, 25 May 2013 18:15:59 +0000 (20:15 +0200)
1  2 
src/collectd.conf.pod

Simple merge