Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4
authorFlorian Forster <octo@huhu.verplant.org>
Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)
committerFlorian Forster <octo@huhu.verplant.org>
Thu, 29 Jan 2009 15:48:18 +0000 (16:48 +0100)
commit9b3423f25e2b64730da81c5708ed986c9a20dd53
tree18162a7d787f49a5d1d15aaf04068955ef4e4aef
parent24cae1ec00520d9fdfdee8a1c8ad21585cb8102d
parent3f786367e7dfe91efbc602ba31fe39d5192117ea
Merge branch 'collectd-4.4' of /var/lib/git/collectd into collectd-4.4