projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23e91d5 60b9a6e)
Merge branch 'katzj/swap'
authorFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:40:53 +0000 (08:40 +0100)
committerFlorian Forster <octo@collectd.org>
Tue, 14 Jan 2014 07:40:53 +0000 (08:40 +0100)

Trivial merge
collectd, the system statistics collection daemon