Merge branch 'ss/graphite'
authorFlorian Forster <octo@collectd.org>
Mon, 13 Feb 2012 21:10:52 +0000 (22:10 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 13 Feb 2012 21:10:52 +0000 (22:10 +0100)
commitc149ae31b04a082f7915f39e8d51ddec4a0595f8
tree8e606646891d338ac38653d5666ce9aad45b8502
parent38c765b29f6c887a5bd4c693ec05731b96368589
parent015aa39bd906a3e3764aeeee440fbf7a645b5372
Merge branch 'ss/graphite'
src/collectd.conf.in