Merge branch 'collectd-5.5'
authorFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 22:08:22 +0000 (23:08 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 5 Dec 2015 22:08:22 +0000 (23:08 +0100)
commit090e054043f6d93b374dee20d766c4f906acd43a
treeb21ad0b970637efea798c8303a2be06caf1970c8
parent40aabf444e124f40603021821e98bcc40c4aaa0e
parentf9a6df05238501ca41931af0d8d51acea716c105
Merge branch 'collectd-5.5'
src/daemon/common.c
src/iptables.c
src/libcollectdclient/network.c