From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 6 May 2012 16:31:41 +0000 (+0200)
Subject: Merge remote-tracking branch 'arne_f/strongswan'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bec4b92648fc8b197e0885c8e019ae13c33f4c2f;p=ipfire-3.x.git

Merge remote-tracking branch 'arne_f/strongswan'
---

bec4b92648fc8b197e0885c8e019ae13c33f4c2f