From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sun, 22 Oct 2006 16:32:58 +0000 (+0200)
Subject: Merge branch 'sh-pidfile'
X-Git-Tag: collectd-3.11.0~68
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8fdec2467f3d4566185a9c9d757376aa3d30413b;p=collectd.git

Merge branch 'sh-pidfile'
---

8fdec2467f3d4566185a9c9d757376aa3d30413b