projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 696dc2a 9ca5a3c)
Merge remote-tracking branch 'dechamps/ipip' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 5 Jan 2018 18:58:28 +0000 (19:58 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 5 Jan 2018 18:58:28 +0000 (19:58 +0100)

Trivial merge
tinc, the VPN daemon