projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 420989e b6ed5c1)
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
tinc, the VPN daemon