Code

Merge branch 'collectd-5.1' into collectd-5.2
authorFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 03:54:24 +0000 (05:54 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 03:54:24 +0000 (05:54 +0200)
commit5efcb2fe5ca723225e4100314a8668d8abc9424a
tree50b0fc0461a3952c15c961dc367e0b427fab8c9e
parent5ac466c7515653ad6c931116643c31f51dabba2e
parent9cbc0fe63abd2bd3658b42f19ee144f803b658fa
Merge branch 'collectd-5.1' into collectd-5.2

Conflicts:
configure.in
configure.in
src/network.c
src/rrdcached.c