projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab37cef 3f5a902)
Merge branch 'sh/next'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 16:51:26 +0000 (17:51 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Mon, 16 Feb 2009 16:51:26 +0000 (17:51 +0100)
Conflicts:

ChangeLog

1  2 
ChangeLog patch | diff1 | diff2 | blob | history

diff --cc ChangeLog
Simple merge
collectd, the system statistics collection daemon