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)
commit7418e9077f84db10ef6bb082a375870a7130bd7d
treeb3e31921e2e9d949b782698c4ae915a27e4e3a35
parent420989e4c3ff109c7d077b2f8c06506540f1c0bd
parentb6ed5c134fc43d438c622d24f949c240632f5e67
Merge remote-tracking branch 'mweinelt/tinc-gui' into 1.1