From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 7 Jan 2014 16:55:57 +0000 (+0100)
Subject: Merge remote-tracking branch 'ms/ipsec-dpd' into fifteen
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f5e106c42ab1fcb54f2d4c2605dfbe213b5b792a;hp=-c

Merge remote-tracking branch 'ms/ipsec-dpd' into fifteen
---

f5e106c42ab1fcb54f2d4c2605dfbe213b5b792a