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)

Trivial merge