From: Guus Sliepen Date: Sun, 17 Jan 2016 22:29:23 +0000 (+0100) Subject: Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1 X-Git-Tag: release-1.1pre12~75 X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=7418e9077f84db10ef6bb082a375870a7130bd7d Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1 --- 7418e9077f84db10ef6bb082a375870a7130bd7d