Merge remote-tracking branch 'origin/pr/488'
authorMarc Fournier <marc.fournier@camptocamp.com>
Sun, 26 Oct 2014 18:45:02 +0000 (19:45 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Sun, 26 Oct 2014 18:45:02 +0000 (19:45 +0100)
commit5c78be034ebf8edbf2ae98e9163a38b2d61fbb68
treea43aab382b33c99a1e21a03f6058077a6dcbb229
parent890ae0c974f1ac310eaea45bf8c05a917949169c
parent6322f8d633a8f82c6b3d2d89e35e78c8299722ac
Merge remote-tracking branch 'origin/pr/488'
src/collectd.conf.in
src/collectd.conf.pod
src/tcpconns.c