]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
projects / thirdparty / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d1bea6 87d29ef)
Merge branch 'pull/master'
authorFlorian Forster <octo@huhu.verplant.org>
Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)
committerFlorian Forster <octo@huhu.verplant.org>
Fri, 12 Oct 2007 20:33:11 +0000 (22:33 +0200)

Trivial merge
Mirror of https://github.com/collectd/collectd.git