projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25fa4ad 4311038)
Merge remote-tracking branch 'origin/master'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 11:41:26 +0000 (12:41 +0100)

Trivial merge
collectd, the system statistics collection daemon