From: Marc Fournier <marc.fournier@camptocamp.com>
Date: Tue, 14 Apr 2015 07:27:00 +0000 (+0200)
Subject: Merge branch 'collectd-5.4'
X-Git-Tag: collectd-5.5.0~38
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=eea01a8f212634414a21462ba79dc058dc5fb304

Merge branch 'collectd-5.4'

Conflicts:
	src/Makefile.am
	src/network.c
---

eea01a8f212634414a21462ba79dc058dc5fb304