Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000 (11:44 +0000)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Mar 2015 11:44:38 +0000 (11:44 +0000)
commitf9ecaa10768926302f24a70975f36e360b51c8ce
treed1cf8398bf12afad43c7434e2e4475d6e15d555d
parentc23e50385d9de538af676706596f6508b2ceb01a
parent2e7f68ad2b51648b89c4b5c61aeb4cec67c2fbbb
Merge remote-tracking branch 'dechamps/sptpsabort' into 1.1