From: Guus Sliepen Date: Sun, 17 May 2015 19:07:45 +0000 (+0200) Subject: Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged'... X-Git-Tag: release-1.1pre12~154 X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=5c32bd1578d59e005f634621d17ca96af32bb630 Merge remote-tracking branches 'dechamps/sptpsrestart' and 'dechamps/keychanged' into 1.1 --- 5c32bd1578d59e005f634621d17ca96af32bb630