Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:52:19 +0000 (18:52 +0100)
commite8999694aac7184ac4eea29564a2892f188c4171
tree6d4f8c268b569d0a30490781746d18ea1f204383
parent78a49673197fd30f544e0a03c7bd60e00503f83e
parentf0d4bdcec565e9882384e3a1a9c8d7a6fb3e78b2
Merge branch 'collectd-4.5' into collectd-4.6
src/common.c
src/memory.c