From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 15 Sep 2007 09:01:19 +0000 (+0200)
Subject: Merge branch 'collectd-3.11' into collectd-4.0
X-Git-Tag: collectd-4.0.9~5
X-Git-Url: https://git.octo.it/?a=commitdiff_plain;h=7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e;p=collectd.git

Merge branch 'collectd-3.11' into collectd-4.0

Conflicts:

	src/apcups.c

nothing added to commit but untracked files present (use "git add" to track)
---

7e5df1a2c6611bd4ac9fb8ac4b78106f9139ae6e