From: Guus Sliepen Date: Thu, 25 Dec 2014 17:13:24 +0000 (+0100) Subject: Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1 X-Git-Tag: release-1.1pre11~10 X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=266afc6c63d3d02584feb24b69063f97057daac8 Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1 --- 266afc6c63d3d02584feb24b69063f97057daac8