projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d53b685 620ba7b)
Merge branch 'master' of /var/lib/git/collectd
authorFlorian Forster <octo@huhu.verplant.org>
Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Sat, 14 Jun 2008 15:53:25 +0000 (17:53 +0200)
Conflicts:

src/email.c


Trivial merge
collectd, the system statistics collection daemon