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)
commit49e3baec20ddad9cc297c3eeb1d13f0e421f69c8
tree55f3eba753ea6a1faabbd961080bfac1a58b77f6
parent37b729d7fdd49da5466696f7995a96ebb54fbcbb
parent2f01744f82be542894fe2ceecbfb9ead93c9ffa5
Merge branch '1.1-ed25519' into 1.1