projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 90ac995 be48914)
Merge branch 'collectd-4.0' into collectd-4.1 collectd-4.1.1
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 12 Sep 2007 12:57:43 +0000 (14:57 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Wed, 12 Sep 2007 12:57:43 +0000 (14:57 +0200)
Conflicts:

contrib/PerlLib/Collectd.pm

nothing added to commit but untracked files present (use "git add" to track)


Trivial merge
collectd, the system statistics collection daemon