projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebfc24c 14de2fe)
Merge remote-tracking branch 'github/master'
authorFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)
committerFlorian Forster <octo@collectd.org>
Fri, 16 Aug 2013 09:27:25 +0000 (11:27 +0200)

Trivial merge
collectd, the system statistics collection daemon