Merge branch 'collectd-5.2'
authorFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 04:17:49 +0000 (06:17 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 04:17:49 +0000 (06:17 +0200)
commit47b7950c0bd0ae0b3823b8bfc4442d6a5dad36c5
tree3320a3826641ac8a6ca0d82b5ca63c654d47ec36
parent2ca216cdb1448df90add943702f0af9ba1bcd0c5
parent5efcb2fe5ca723225e4100314a8668d8abc9424a
Merge branch 'collectd-5.2'
configure.in
src/network.c
src/nfs.c
src/rrdcached.c