Merge branch 'ff/filter'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Nov 2008 00:06:11 +0000 (01:06 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 22 Nov 2008 00:06:11 +0000 (01:06 +0100)
1  2 
configure.in

diff --cc configure.in
Simple merge