Merge remote-tracking branch 'origin/pr/1239'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Apr 2016 20:22:44 +0000 (22:22 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 22 Apr 2016 20:22:44 +0000 (22:22 +0200)
1  2 
src/collectd.conf.pod
src/sensors.c

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