From: Gerd von Egidy <gerd.von.egidy@intra2net.com>
Date: Thu, 7 Jan 2010 16:28:43 +0000 (+0100)
Subject: Merge branch 'strongswan-4.3'
X-Git-Tag: v2.6~116
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=49573dc7bdd02ea7c25b4ca89bdea27a5b898fc4;p=libi2ncommon

Merge branch 'strongswan-4.3'

strongswan 4.3 was stable on first tests, just discovered bug #1615. we can fix that in master

Conflicts:
	packages/strongswan/strongswan.spec
---

49573dc7bdd02ea7c25b4ca89bdea27a5b898fc4