From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Jul 2013 10:51:26 +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~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4f64e2090f61fd68dadbaec989b6cb38ba9d9604;p=people%2Fms%2Fipfire-2.x.git

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

4f64e2090f61fd68dadbaec989b6cb38ba9d9604