Merge branch 'collectd-5.4' into collectd-5.5
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 6 Nov 2015 08:40:56 +0000 (09:40 +0100)
1  2 
src/apcups.c

diff --cc src/apcups.c
Simple merge