From: Florian Forster <octo@collectd.org>
Date: Wed, 28 Nov 2012 09:16:26 +0000 (+0100)
Subject: Merge branch 'sh/config-include'
X-Git-Tag: collectd-5.3.0~68
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=6a8d29a816f8a1a6b2a1c82d5c33ceba8d006f25;p=collectd.git

Merge branch 'sh/config-include'
---

6a8d29a816f8a1a6b2a1c82d5c33ceba8d006f25