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)
commit499cbd1605850e0feca405fb2579064d330eea8f
treeb695b491b2cbcca6f50b923ea1f70ef5edf001dc
parent5131a49ad0584aa22282aacf72b6e4ca75356bae
parente2fbbb90f9c33c5718ad1a1396f6f43bc872e898
Merge branch 'sr/pf'
configure.in
src/Makefile.am