projects / collectd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ff4e029 ce8b96a)
Merge remote branch 'origin/master'
authorFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 15:31:50 +0000 (16:31 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 16 Mar 2013 15:31:50 +0000 (16:31 +0100)
1  2 
configure.in patch | diff1 | diff2 | blob | history

diff --cc configure.in
Simple merge
collectd, the system statistics collection daemon