]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 19 Mar 2016 15:47:33 +0000 (16:47 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sat, 19 Mar 2016 15:47:33 +0000 (16:47 +0100)
1  2 
src/daemon/utils_random.c
src/utils_latency.c

Simple merge
Simple merge