Merge branch 'collectd-5.4'
authorMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Tue, 14 Apr 2015 07:27:00 +0000 (09:27 +0200)
commiteea01a8f212634414a21462ba79dc058dc5fb304
tree68c15a590ba6b560a4f54ef3a5cda0cec812986f
parent0cf5df3dbcf508d419b52d3deecac9ba74b2e260
parent02c45fc2ecb087fb140e90217e5b701959306c1a
Merge branch 'collectd-5.4'

Conflicts:
src/Makefile.am
src/network.c
version-gen.sh