From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Mon, 16 Feb 2009 16:51:26 +0000 (+0100)
Subject: Merge branch 'sh/next'
X-Git-Tag: collectd-4.6.0~3
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=979041ee0516ee373ef5d1d90f749864c3baef38

Merge branch 'sh/next'

Conflicts:

	ChangeLog
---

979041ee0516ee373ef5d1d90f749864c3baef38