From: Guus Sliepen <guus@sliepen.eu.org>
Date: Wed, 16 Sep 2009 17:55:47 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre1~117
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=075e6828a7533e7daa790225f17aa6bb39703278;hp=075e6828a7533e7daa790225f17aa6bb39703278;p=tinc

Merge branch 'master' into 1.1

Conflicts:
	have.h
	lib/dropin.c
	lib/fake-getaddrinfo.c
	lib/pidfile.c
	src/Makefile.am
	src/bsd/device.c
	src/conf.c
	src/connection.c
	src/connection.h
	src/graph.c
	src/mingw/device.c
	src/net.c
	src/net_setup.c
	src/node.c
	src/protocol_key.c
	src/protocol_misc.c
	src/tincd.c
---