Code

Merge branch 'master' into sid collectd-5.6.1-1
authorMarc Fournier <marc@bl.uem.li>
Sun, 9 Oct 2016 20:06:07 +0000 (22:06 +0200)
committerMarc Fournier <marc@bl.uem.li>
Sun, 9 Oct 2016 20:06:07 +0000 (22:06 +0200)
commitbcabe68fa8833ffc00f884155f748b6408b083ca
tree23b3d2232f7d3d1301dfd6624788f8e55577e257
parent4269cf669f0392c4ac23f315e76a5c5381504630
parent0012d05a038d711861f3df9236baabd3aa2d25cb
Merge branch 'master' into sid