From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 17 Apr 2010 10:21:53 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre1~75
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=79e46d08a46f2fef2ee4e8eac7ba487007160564;hp=79e46d08a46f2fef2ee4e8eac7ba487007160564;p=tinc

Merge branch 'master' into 1.1

Conflicts:
	NEWS
	README
	configure.in
	src/net.c
	src/net.h
---