projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1ec7adf 7fb30eb)
Merge branch 'sh/master'
authorFlorian Forster <octo@huhu.verplant.org>
Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Wed, 22 Aug 2007 14:36:10 +0000 (16:36 +0200)
Conflicts:

configure.in


Trivial merge
collectd, the system statistics collection daemon