Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sun, 30 Sep 2012 13:00:47 +0000 (15:00 +0200)
commit6dfdb323612184529b4b83c1be914dda8262de47
treef57efbebbfe65ad7017305502d9d1c808b24f6ec
parent9e76c464b26b066e1eb3aa5232e573792e28020d
parentc4940a5c888d85b4c477b6face5e9a618e64718d
Merge branch 'master' into 1.1

Conflicts:
lib/utils.c
src/net_setup.c
src/process.c
src/protocol_auth.c
src/protocol_key.c
src/utils.h
THANKS
src/net_setup.c
src/openssl/rsa.c
src/process.c
src/protocol_key.c
src/tincd.c
src/utils.c