Merge branch 'sr/pf'
authorFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:42:55 +0000 (09:42 +0100)
committerFlorian Forster <octo@collectd.org>
Sat, 17 Nov 2012 08:42:55 +0000 (09:42 +0100)
1  2 
configure.in
src/Makefile.am

diff --cc configure.in
Simple merge
diff --cc src/Makefile.am
Simple merge