projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c344f2 1e2485a)
Merge remote-tracking branch 'VittGam/master'
authorGuus Sliepen <guus@tinc-vpn.org>
Tue, 21 Mar 2017 20:48:08 +0000 (21:48 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Tue, 21 Mar 2017 20:48:08 +0000 (21:48 +0100)

Trivial merge
tinc, the VPN daemon