projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 09a1be1 59c7ee1)
Merge branch 'collectd-5.0'
authorFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 25 Feb 2012 17:16:59 +0000 (18:16 +0100)
Conflicts:
src/amqp.c

Change-Id: I85ab3ee2b51830ad0b5d474cf1f18b5c828d6588

1  2 
src/bind.c patch | diff1 | diff2 | blob | history

diff --cc src/bind.c
Simple merge
collectd, the system statistics collection daemon