[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b3c937 2de9f5f)
Merge branch 'master' into sid collectd-5.7.0-3
authorMarc Fournier <marc@bl.uem.li>
Sun, 18 Dec 2016 21:13:34 +0000 (22:13 +0100)
committerMarc Fournier <marc@bl.uem.li>
Sun, 18 Dec 2016 21:13:34 +0000 (22:13 +0100)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.