Merge remote-tracking branch 'origin/pr/693'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:06:25 +0000 (00:06 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:06:25 +0000 (00:06 +0200)
commitcb314c15d51352ebcc4cfd2bbf1d6a3042c2402f
treec4dbaec5686c18fe13bb7ad5448d3bc09f9eab66
parent5d0ef486144dea177f42f2d8ff88dd83adb2d367
parentc0a9b8c3fea7ccf4bdf2c7706877c7aed6a03be5
Merge remote-tracking branch 'origin/pr/693'

Conflicts:
src/collectd.conf.pod
README
src/collectd.conf.pod