Merge remote-tracking branch 'ms/ipsec-dpd' into fifteen
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Jan 2014 16:55:57 +0000 (17:55 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Tue, 7 Jan 2014 16:55:57 +0000 (17:55 +0100)

Trivial merge