Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Thu, 25 Dec 2014 17:13:24 +0000 (18:13 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Thu, 25 Dec 2014 17:13:24 +0000 (18:13 +0100)

Trivial merge