From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Wed, 1 Nov 2006 10:09:47 +0000 (+0100)
Subject: Merge branch 'ff/ntpd'
X-Git-Tag: collectd-3.11.0~61^2~5
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=2b19a39383baeebb4fe290e156eb709f044d0593;p=collectd.git

Merge branch 'ff/ntpd'
---

2b19a39383baeebb4fe290e156eb709f044d0593