projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a321fd4 1663ae3)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)
committerFlorian Forster <octo@collectd.org>
Mon, 16 Dec 2013 16:17:55 +0000 (17:17 +0100)

Trivial merge
collectd, the system statistics collection daemon