projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 21ef849 a1e1d77)
Merge branch 'pr/381'
authorFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)
committerFlorian Forster <octo@collectd.org>
Wed, 7 Aug 2013 06:39:08 +0000 (08:39 +0200)

Trivial merge
collectd, the system statistics collection daemon