From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 20 Jul 2013 16:48:29 +0000 (+0200)
Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into strongswan-next
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=72417e2f7bdffa0c53510215f7dfd866a9da2f38

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

72417e2f7bdffa0c53510215f7dfd866a9da2f38