From: Guus Sliepen <guus@tinc-vpn.org>
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://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=7418e9077f84db10ef6bb082a375870a7130bd7d;p=tinc

Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1
---

7418e9077f84db10ef6bb082a375870a7130bd7d