[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3d33c6a 7ea55ea)
Merge branch 'master' into sid collectd-5.7.1-1
authorMarc Fournier <marc@bl.uem.li>
Mon, 23 Jan 2017 19:48:23 +0000 (20:48 +0100)
committerMarc Fournier <marc@bl.uem.li>
Mon, 23 Jan 2017 19:48:23 +0000 (20:48 +0100)

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