Merge branch 'master' into katzj/memory
authorFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:43:06 +0000 (08:43 +0100)
commitbf67ab648e6d835dd53f81791cfb6b651a2ba814
tree7087dcf36d79970608b68b91a0ed4c8f74197a79
parentec48743ad9a09498fe4c8156ae5b67529cfdb435
parent3c7af521c4551c78e9139b9ac8b2d56f693fb2f8
Merge branch 'master' into katzj/memory
src/collectd.conf.in
src/collectd.conf.pod