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)
commit266afc6c63d3d02584feb24b69063f97057daac8
tree8b8527b31c7b6c2c32eff934dff1518fbc82bfce
parent7730d5f3ed9bd7c011dced5808130ffcbd74ea6b
parentc269a17ca4d4e4946a3f8ab05da8cdd338d97ffb
Merge remote-tracking branch 'groxxda/gui-fixes' into 1.1