From: Florian Forster <octo@noris.net>
Date: Mon, 14 Jul 2008 07:44:29 +0000 (+0200)
Subject: Merge branch 'collectd-4.3' into collectd-4.4
X-Git-Tag: collectd-4.4.2~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e51eefd95e80f90eae602958713c9c630659ce7;p=collectd.git

Merge branch 'collectd-4.3' into collectd-4.4

Conflicts:

	src/ntpd.c
---

4e51eefd95e80f90eae602958713c9c630659ce7