]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Fri, 11 Dec 2015 20:56:40 +0000 (21:56 +0100)
1  2 
src/daemon/utils_ignorelist.c
src/swap.c

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