Code

Merge branch 'st/netapp'
authorFlorian Forster <octo@noris.net>
Wed, 30 Sep 2009 16:20:32 +0000 (18:20 +0200)
committerFlorian Forster <octo@noris.net>
Wed, 30 Sep 2009 16:20:32 +0000 (18:20 +0200)
1  2 
configure.in

diff --cc configure.in
Simple merge