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)
commit36ee20dc97d0e0a5483892667f5d032618e18f10
tree3baed22d6977263d2f3e84443bd7633ed4b72040
parent5102d4262dd5c08ecbb08a24e1ce510fb02f51bd
parent8ed3735980de12f32dd488d0d285d108f098836e
Merge remote-tracking branch 'origin/pr/1239'
src/collectd.conf.pod
src/sensors.c