From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 12 Sep 2012 14:14:31 +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~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e218d500dd4e7d17591df9c449387c00359ee728;p=ipfire-2.x.git

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

e218d500dd4e7d17591df9c449387c00359ee728