From: Michael Tremer Date: Wed, 28 Nov 2012 21:12:50 +0000 (+0100) Subject: Merge remote-tracking branch 'amarx/ipsec' into next X-Git-Tag: v2.11-core65~1^2~12 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f4819f1f76c38963382b5f9bb052a8fc366432d5;p=people%2Fms%2Fipfire-2.x.git Merge remote-tracking branch 'amarx/ipsec' into next --- f4819f1f76c38963382b5f9bb052a8fc366432d5