Code

Merge branch 'collectd-4.1' into collectd-4.2
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 19:53:57 +0000 (20:53 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 23 Jan 2008 19:53:57 +0000 (20:53 +0100)
commitabf236a5ede80324ef7dc609d033ff919a0afdcc
tree5bf6dd808caff9c553e9d179e9b6f5d3648c2d27
parent8cf1acdb96d027b1d48c9dfb74fea313e63ceedf
parent5abaf1661442bfa9b7deac7e8e5a549d04a194d8
Merge branch 'collectd-4.1' into collectd-4.2