From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 15 Jul 2012 11:15:11 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
X-Git-Tag: v2.13-beta1~168^2~15
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b829fa10cc91535ca9b8c7708b3168dd54d34e9c;p=people%2Fms%2Fipfire-2.x.git

Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-5
---

b829fa10cc91535ca9b8c7708b3168dd54d34e9c