Code

Merge branch 'collectd-4.8' into collectd-4.9
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:51 +0000 (13:11 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 15 Dec 2009 12:11:51 +0000 (13:11 +0100)
1  2 
ChangeLog
configure.in
src/memory.c

diff --cc ChangeLog
Simple merge
diff --cc configure.in
Simple merge
diff --cc src/memory.c
Simple merge