Merge branch 'collectd-4.8'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:18:05 +0000 (20:18 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 10 Nov 2009 19:18:05 +0000 (20:18 +0100)
commitb958bfe961cf8c6a442d18c714a9d04e947e6b74
tree7bf038b69417f36fdb70aeea4c88310c75ce493a
parent9fbaea758b3821d305a89782b8f260cc787e21ab
parent179242223f25937fc528e89ef433a80d4d614611
Merge branch 'collectd-4.8'
src/Makefile.am
src/rrdcached.c