From: Sven Trenkel <collectd@semidefinite.de>
Date: Thu, 1 Oct 2009 11:25:17 +0000 (+0200)
Subject: Merge commit 'octo/master'
X-Git-Tag: collectd-4.9.0~71
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=8d3fe5fb26cb6de1ee58cba572cb38ac93e906b2

Merge commit 'octo/master'
---

8d3fe5fb26cb6de1ee58cba572cb38ac93e906b2