Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 9 Mar 2009 18:02:24 +0000 (19:02 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 9 Mar 2009 18:02:24 +0000 (19:02 +0100)
commit08aabbf9317806bc50a9a6693ca866c8936ce26b
treecffb3736abbe50f952d8507d2e90eb6a863be2dc
parent551cd19406a560d0d206bff5b4e9da064ec222b6
parent43fa7283ac01f2ecc95381b519ef6b3342546f35
Merge branch 'master' into 1.1

Conflicts:
NEWS
README
doc/tinc.conf.5.in
doc/tinc.texi
po/nl.po
src/conf.c
src/connection.c
src/event.c
src/graph.c
src/net.c
src/net_packet.c
src/net_socket.c
src/node.c
src/node.h
src/openssl/rsagen.h
src/protocol_auth.c
src/protocol_key.c
src/protocol_misc.c
src/subnet.c
src/subnet.h
src/tincd.c
30 files changed:
NEWS
README
doc/tinc.texi
src/bsd/device.c
src/conf.c
src/conf.h
src/connection.c
src/cygwin/device.c
src/graph.c
src/linux/device.c
src/mingw/device.c
src/net.c
src/net.h
src/net_packet.c
src/net_setup.c
src/net_socket.c
src/node.c
src/node.h
src/process.c
src/protocol_auth.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/subnet.h
src/tincd.c
src/uml_socket/device.c