From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 6 Jun 2011 18:42:15 +0000 (+0200)
Subject: Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
X-Git-Tag: release-1.1pre1~11
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;ds=sidebyside;h=33f241d97852d7a171f1aaf1bda7f66356ff889e;hp=33f241d97852d7a171f1aaf1bda7f66356ff889e;p=tinc

Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
	NEWS
	configure.in
	doc/tincd.8.in
	lib/pidfile.c
	lib/pidfile.h
	lib/xalloc.h
	lib/xmalloc.c
	src/conf.c
	src/conf.h
	src/connection.c
	src/connection.h
	src/event.c
	src/graph.c
	src/graph.h
	src/net.c
	src/net.h
	src/node.h
	src/openssl/crypto.c
	src/process.c
	src/protocol.c
	src/protocol_key.c
	src/route.c
---