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