From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 17 Jul 2013 15:45:40 +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=15fbfae62747088414e48ad0bc380a488265af1f;hp=-c

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

15fbfae62747088414e48ad0bc380a488265af1f