Code

Merge branch 'collectd-5.4' into collectd-5.5
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Sun, 6 Mar 2016 11:08:59 +0000 (12:08 +0100)
1  2 
src/utils_mount.c
src/zfs_arc.c

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