Fix merge of commit 4a0b9981513059755b9fd15b38fc198f46a0d6f2.
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:33:15 +0000 (12:33 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 17 Apr 2010 10:33:15 +0000 (12:33 +0200)
commit2911af6e23d0dba6d771fcd590551a84bd9dc932
treed85fd016298fbee1b0efcbbed9615e24eab1e472
parent79e46d08a46f2fef2ee4e8eac7ba487007160564
Fix merge of commit 4a0b9981513059755b9fd15b38fc198f46a0d6f2.
src/protocol_key.c