From: Florian Forster <octo@leeloo.lan.home.verplant.org>
Date: Sat, 6 Nov 2010 11:15:52 +0000 (+0100)
Subject: Merge branch 'ff/netlib' into ja/zeromq
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=0b430c62307f429de02f814c0966946fdef36259;p=collectd.git

Merge branch 'ff/netlib' into ja/zeromq
---

0b430c62307f429de02f814c0966946fdef36259