[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4269cf6 0012d05)
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)

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