Merge branch 'collectd-4.5' into collectd-4.6
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 9 May 2009 10:29:44 +0000 (12:29 +0200)
commit37905c5a2370c8e6edae5011978773eeaa589d09
treee2a025875d64ca85d4beac8e7ddd21c1fa9df99f
parenta940e2555464956ae7b61d8d0d742f2acc001c5f
parent39f3ecb1fc15fb1978c7ac6ccc1c6a9091785604
Merge branch 'collectd-4.5' into collectd-4.6
configure.in
src/collectd.h
src/swap.c