Code

Merge branch 'collectd-5.5'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 26 Jul 2016 10:50:36 +0000 (12:50 +0200)
1  2 
src/daemon/meta_data.c
src/network.c

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