projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7983aff 3e2a37d)
Merge branch 'ff/redis' into ad/redis
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:33 +0000 (18:43 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Tue, 17 Aug 2010 16:43:33 +0000 (18:43 +0200)

Trivial merge
collectd, the system statistics collection daemon