]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:10 +0000 (22:16 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Thu, 3 Mar 2016 21:16:10 +0000 (22:16 +0100)
1  2 
src/daemon/utils_avltree.c

Simple merge