From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 14 Jul 2013 10:48:29 +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~12
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=bf9a484fb83ecf2e5d9d67f6f58d48b6b262fc67;p=people%2Fms%2Fipfire-2.x.git

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

bf9a484fb83ecf2e5d9d67f6f58d48b6b262fc67