projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0819379 fcdef56)
Merge branch 'jk/snmp' into collectd-5.1
authorFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 17:20:14 +0000 (19:20 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 7 Apr 2013 17:20:14 +0000 (19:20 +0200)

Trivial merge
collectd, the system statistics collection daemon