[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2daec89 45fbcdc)
Merge branch 'master' into sid
authorMarc Fournier <marc@bl.uem.li>
Tue, 31 May 2016 16:34:06 +0000 (18:34 +0200)
committerMarc Fournier <marc@bl.uem.li>
Tue, 31 May 2016 16:34:06 +0000 (18:34 +0200)

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