Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:08:10 +0000 (18:08 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 14 Mar 2009 17:08:10 +0000 (18:08 +0100)
commitf0d4bdcec565e9882384e3a1a9c8d7a6fb3e78b2
tree8d02fa3f93fc109ca8f5705b2a2037c636579d03
parent4fc99a11cac5ab6d833b63cd04028d4ee09bd318
parent157045783cadbe242b237ed9c39f1ca5e622efaf
Merge branch 'collectd-4.5' of octo@verplant.org:/var/lib/git/collectd into collectd-4.5