From: Sebastian Harl <sh@tokkee.org>
Date: Thu, 7 May 2009 08:30:19 +0000 (+0200)
Subject: Merge branch 'master' of git://git.tokkee.org/pkg-collectd
X-Git-Tag: collectd-4.6.2-2~6
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7ec99a80dd9a4d0a2794535e09b03da17158f644;p=pkg-collectd.git

Merge branch 'master' of git://git.tokkee.org/pkg-collectd
---

7ec99a80dd9a4d0a2794535e09b03da17158f644