Code

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

diff --cc configure.in
Simple merge