Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 9 May 2011 19:35:14 +0000 (21:35 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 9 May 2011 19:35:14 +0000 (21:35 +0200)
commitce8775000ab38229a78ecf3dc26bab008ca0f332
tree85473a3833d4c6c4e5a1d4218a0db859a2aec385
parent3f59a26d8098b8b0902b8746715508360b347f47
parent5686ad80b545afa3de9ed2f4176a5346e289aaa8
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
NEWS
README
configure.in
doc/tincd.8.in
lib/pidfile.c
src/bsd/device.c
src/dropin.h
src/net.c
src/net_packet.c
src/node.c
src/process.c
src/tincd.c
21 files changed:
NEWS
README
configure.in
doc/tinc.texi
doc/tincd.8.in
have.h
src/bsd/device.c
src/conf.c
src/dropin.c
src/dropin.h
src/graph.c
src/memcmp.c
src/mingw/device.c
src/net.c
src/net_packet.c
src/netutl.c
src/node.c
src/process.c
src/protocol_key.c
src/solaris/device.c
src/tincd.c