Merge branch 'netlinkfix' of git://github.com/marekbecka/collectd
authorFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:24:59 +0000 (20:24 +0100)
committerFlorian Forster <octo@collectd.org>
Wed, 13 Nov 2013 19:24:59 +0000 (20:24 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge