Merge branch 'master' into f/riemann/rcc
authorPierre-Yves Ritschard <pyr@spootnik.org>
Mon, 18 Apr 2016 08:10:47 +0000 (10:10 +0200)
committerPierre-Yves Ritschard <pyr@spootnik.org>
Mon, 18 Apr 2016 08:10:47 +0000 (10:10 +0200)
commit810e8f5d687514841ed0ea445764ccc05e8f5299
tree99ec57c34bbc528b230ccb8e8adc6f8cc154a475
parent8e0e8593647ea67a4a41a45f2be30aa3d8ca6eaa
parent8b3afb76805d0e0bbaf2b7ef3f37c07c1ebf0ffb
Merge branch 'master' into f/riemann/rcc
configure.ac
src/collectd.conf.pod