From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sun, 30 Sep 2012 13:00:47 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre3~36
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=6dfdb323612184529b4b83c1be914dda8262de47;hp=6dfdb323612184529b4b83c1be914dda8262de47;p=tinc

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
---