From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Fri, 20 Jul 2012 07:04:42 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/strongswan-5' into kernel-update
X-Git-Tag: v2.13-beta1~256^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=14356fb908fd6062e987d61cc4c85a618e2fc180;p=people%2Fms%2Fipfire-2.x.git

Merge remote-tracking branch 'ms/strongswan-5' into kernel-update
---

14356fb908fd6062e987d61cc4c85a618e2fc180