From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 29 Sep 2009 12:55:29 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre1~112
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;ds=sidebyside;h=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;hp=7ea85043ac1fb2096baea44f6b0af27ac0d0b2cf;p=tinc

Merge branch 'master' into 1.1

Conflicts:
	NEWS
	configure.in
	lib/Makefile.am
	lib/pidfile.c
	lib/pidfile.h
	lib/utils.c
	po/POTFILES.in
	po/nl.po
	src/Makefile.am
	src/bsd/device.c
	src/conf.c
	src/connection.c
	src/cygwin/device.c
	src/edge.c
	src/event.c
	src/graph.c
	src/linux/device.c
	src/meta.c
	src/mingw/device.c
	src/net.c
	src/net_packet.c
	src/net_setup.c
	src/net_socket.c
	src/netutl.c
	src/node.c
	src/process.c
	src/protocol.c
	src/protocol_auth.c
	src/protocol_edge.c
	src/protocol_key.c
	src/protocol_misc.c
	src/protocol_subnet.c
	src/raw_socket/device.c
	src/route.c
	src/solaris/device.c
	src/subnet.c
	src/tincd.c
	src/uml_socket/device.c
---