projects / tinc / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f6a96a 6455654)
Merge branch 'master' of black:tinc
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 10:43:00 +0000 (11:43 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 10:43:00 +0000 (11:43 +0100)

Trivial merge
tinc, the VPN daemon