Merge branch 'collectd-5.7'
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 16:21:11 +0000 (17:21 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 5 Mar 2017 16:21:11 +0000 (17:21 +0100)
commit9717b1a55d60d992c16e66e2ae5bdfb42f80aca8
treeeb31b310953306dde6a0b822134480c56f709b3c
parent79a94204db8de144bf5bd84159afde444df9e0a4
parentffaf9b893b6042a76e1c0dadd83ce06904fcc89a
Merge branch 'collectd-5.7'

Conflicts:
configure.ac
configure.ac