projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca3fb93 ae210a9)
Merge branch 'collectd-4.3' into collectd-4.4
authorFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:46 +0000 (13:16 +0200)
committerFlorian Forster <sifnfors@informatik.stud.uni-erlangen.de>
Tue, 27 May 2008 11:16:46 +0000 (13:16 +0200)

Trivial merge
collectd, the system statistics collection daemon