From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 8 Oct 2012 22:30:33 +0000 (+0200)
Subject: Merge branch 'strongswan-5' into thirteen
X-Git-Tag: v2.13-beta1~168
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=207c9813bc3e1ef121bb1bac89752c0a850dda6d

Merge branch 'strongswan-5' into thirteen
---

207c9813bc3e1ef121bb1bac89752c0a850dda6d