[tokkee]

tokkee.org

Code

projects / pkg-collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0a61885 f1ba982)
Merge branch 'master' into sid
authorMarc Fournier <marc.fournier@camptocamp.com>
Mon, 16 Nov 2015 20:09:40 +0000 (21:09 +0100)
committerMarc Fournier <marc.fournier@camptocamp.com>
Mon, 16 Nov 2015 20:09:40 +0000 (21:09 +0100)

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