]> git.ipfire.org Git - people/teissler/ipfire-2.x.git/commit
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)
commitf5e106c42ab1fcb54f2d4c2605dfbe213b5b792a
tree19a24fa47e5a3562ab117ec0f6de6b8a95f56e70
parent277060a472c826541885b40392e0d5a96ba1cf97
parentaf8750fdc2c974899c35114a7340f51a09516bd9
Merge remote-tracking branch 'ms/ipsec-dpd' into fifteen