From: Guus Sliepen Date: Sun, 12 Apr 2015 13:43:05 +0000 (+0200) Subject: Merge remote-tracking branch 'dechamps/wintapver' into 1.1 X-Git-Tag: release-1.1pre12~184 X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=3def9d2ad88a9015af4c42aac329e0e2a80679f7 Merge remote-tracking branch 'dechamps/wintapver' into 1.1 --- 3def9d2ad88a9015af4c42aac329e0e2a80679f7