[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: dadeee5 43eaffd)
Merge branch 'master' into sid collectd-5.5.1-1
authorMarc Fournier <marc@bl.uem.li>
Fri, 22 Jan 2016 16:36:11 +0000 (17:36 +0100)
committerMarc Fournier <marc@bl.uem.li>
Fri, 22 Jan 2016 16:36:11 +0000 (17:36 +0100)

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