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)
commit4a66dbcdb3c68eec473626e969670717303ec5e4
tree1503996f1601f8dd7011d27d5a6d1db30af90d66
parent21d12548861a8a4f641a5291f6f47421737d6124
parent5dc8a8ccd8fa0582a83b9e37bbde8f669bc06fca
Merge branch 'document-varnish-instance-block' into collectd-5.2
src/collectd.conf.pod