Merge branch 'feature-write_graphite-udp' of git://github.com/jjmaestro/collectd
authorFlorian Forster <octo@collectd.org>
Tue, 18 Jun 2013 06:14:59 +0000 (08:14 +0200)
committerFlorian Forster <octo@collectd.org>
Tue, 18 Jun 2013 06:14:59 +0000 (08:14 +0200)
1  2 
AUTHORS

diff --cc AUTHORS
Simple merge