projects / oweals / tinc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 37b729d 2f01744)
Merge branch '1.1-ed25519' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 14 Apr 2014 18:49:43 +0000 (20:49 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 14 Apr 2014 18:50:16 +0000 (20:50 +0200)

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.