projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2d8e923 f61af68)
Merge branch 'jr/json'
authorFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 08:03:52 +0000 (10:03 +0200)
committerFlorian Forster <octo@collectd.org>
Sun, 18 Aug 2013 08:03:52 +0000 (10:03 +0200)

Trivial merge
collectd, the system statistics collection daemon