]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 5 Aug 2016 11:12:03 +0000 (13:12 +0200)
1  2 
src/daemon/plugin.c
src/network.c

Simple merge
diff --cc src/network.c
Simple merge