From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Tue, 5 Dec 2006 17:00:57 +0000 (+0100)
Subject: Merge branch 'sh/shutdown'
X-Git-Tag: collectd-3.11.0~26^2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63b17f56013ccbe262a745f418dc294b72408b02;p=collectd.git

Merge branch 'sh/shutdown'
---

63b17f56013ccbe262a745f418dc294b72408b02