Merge branch 'collectd-4.2' into collectd-4.3
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 3 Apr 2008 07:38:56 +0000 (09:38 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Thu, 3 Apr 2008 07:38:56 +0000 (09:38 +0200)
commit79e2f5ddc8bffe7ba604530b6090b5d7f7ec9bb1
tree8acef26732046ad85ddea8e2520d9e6c57a17711
parent4fb5d4b471e3f6a24d7cd36272e48e57bcb2c68f
parent23fccc73750af9440eabaef21c6a0955faf14556
Merge branch 'collectd-4.2' into collectd-4.3