From: Michael Tremer Date: Thu, 1 Aug 2013 16:24:03 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next X-Git-Tag: v2.13-core72^2~23^2~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ae99d423b9ed13c2b7960833b81becd781a1ac58;p=people%2Fstevee%2Fipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next --- ae99d423b9ed13c2b7960833b81becd781a1ac58