From: Florian Forster <octo@collectd.org>
Date: Sat, 17 Nov 2012 08:42:55 +0000 (+0100)
Subject: Merge branch 'sr/pf'
X-Git-Tag: collectd-5.2.0~12
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=499cbd1605850e0feca405fb2579064d330eea8f;p=collectd.git

Merge branch 'sr/pf'
---

499cbd1605850e0feca405fb2579064d330eea8f