projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: af1f480 37932f9)
Merge branch 'ad/memcached'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 24 Oct 2007 17:57:56 +0000 (19:57 +0200)

Trivial merge
collectd, the system statistics collection daemon