Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 17 Jan 2016 22:29:23 +0000 (23:29 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 17 Jan 2016 22:29:23 +0000 (23:29 +0100)

Trivial merge