projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 969ad2b bec423a)
Merge branch 'kr/ctxt'
authorFlorian Forster <octo@noris.net>
Wed, 29 Sep 2010 15:06:00 +0000 (17:06 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 29 Sep 2010 15:06:00 +0000 (17:06 +0200)

Trivial merge
collectd, the system statistics collection daemon