Merge remote-tracking branch 'origin/pr/993'
authorMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
committerMarc Fournier <marc.fournier@camptocamp.com>
Wed, 8 Apr 2015 22:08:21 +0000 (00:08 +0200)
commit76d9c9033e021cbdb0da0fc2b0ad23bc3d7ad487
treea3e74192f384a049fe43e89224e42717b038f6f6
parent09c57e6f2fa67509f815245329610ef0658709f7
parent6466bdb79c1f36b9f2867b92605928ddc39d0605
Merge remote-tracking branch 'origin/pr/993'
src/bind.c
src/collectd.conf.pod