Merge remote-tracking branch 'origin/pr/985'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:07:07 +0000 (00:07 +0200)
commit09c57e6f2fa67509f815245329610ef0658709f7
tree58b43f87b60eb1d2c29347949ebf7e746cb0aedc
parentcb314c15d51352ebcc4cfd2bbf1d6a3042c2402f
parent943d5088b10e88009b98948d016c623f1d61bb17
Merge remote-tracking branch 'origin/pr/985'
src/collectd.conf.pod