From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 14 Mar 2015 11:44:38 +0000 (+0000)
Subject: Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
X-Git-Tag: release-1.1pre12~197
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=f9ecaa10768926302f24a70975f36e360b51c8ce;p=tinc

Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
---

f9ecaa10768926302f24a70975f36e360b51c8ce