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)
Conflicts:
src/Makefile.am
src/network.c

1  2 
version-gen.sh

diff --cc version-gen.sh
Simple merge