Code

Merge branch 'jr/varnish'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Mar 2012 10:45:44 +0000 (11:45 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Mar 2012 10:45:44 +0000 (11:45 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge