removed conflicts
authorAndreas Steffen <andreas.steffen@strongswan.org>
Wed, 3 Aug 2011 08:35:58 +0000 (10:35 +0200)
committerAndreas Steffen <andreas.steffen@strongswan.org>
Thu, 8 Sep 2011 10:08:09 +0000 (12:08 +0200)
commitf5f19c334bde6db6b940be8c86590e794860b93a
tree508ba16d8ec26d7865e674cc7be93941d7ccce84
parentcbea1a31fb9844f37a8bbedfe0436e7a1c368ea9
removed conflicts
configure.in