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