Merge remote-tracking branch 'origin/pr/1229'
authorMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Fri, 11 Sep 2015 20:17:44 +0000 (22:17 +0200)
commit996f8b63eb79d98640174eeb3c26451b10c09dda
treeacfa98ca945c21768f0c61cdcc5ec10c1ab7bda8
parent06d15fe3e9c6d6cd72fb97643b29c4be344c0117
parent48dc1784882dc5cd939c621a1a09fd1a70fc3092
Merge remote-tracking branch 'origin/pr/1229'
src/collectd.conf.pod