Code

Merge branch 'collectd-4.6' into collectd-4.7
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 17:25:01 +0000 (19:25 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 4 May 2009 17:25:01 +0000 (19:25 +0200)
commitfe9ba13c8866ada19f7a347f3757d4c740613cdb
tree648fdd3ab7cfdd81855e23d49d78508123971b24
parent085a993e0f187ad73d3a28cea508ec6e56c39516
parent8692579147f7e5cfbd4168a2da926dfd20e592f4
Merge branch 'collectd-4.6' into collectd-4.7