Merge branch 'strongswan-v4'
authorGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
committerGerd von Egidy <gerd.von.egidy@intra2net.com>
Tue, 31 Mar 2009 08:57:15 +0000 (10:57 +0200)
commita4a4891720d19980e48e491be81b99ee55ad0ff7
treee4cf96166dfa90b064c753ede0641b6aefa94aec
parent6a16940e0ff8507dfc8f689a01a0cde9a5fd0cb7
parent2635a78c58e20621d9d56b10a5036a945ebd3ec4
Merge branch 'strongswan-v4'

Conflicts:
.gitignore
packages/strongswan/strongswan.spec