projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7cfb6b8 1dae712)
Merge remote branch 'jeromer/master' into jr/varnish
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:35:27 +0000 (15:35 +0200)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sun, 13 Jun 2010 13:35:27 +0000 (15:35 +0200)
1  2 
src/varnish.c patch | diff1 | diff2 | blob | history

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