Guus Sliepen 108b238915 Merge branch 'master' into 1.1 ... Conflicts: NEWS README configure.in doc/tinc.texi doc/tincd.8.in src/Makefile.am src/connection.c src/edge.c src/meta.c src/net.c src/net.h src/net_packet.c src/net_setup.c src/net_socket.c src/node.c src/openssl/rsagen.h src/protocol_auth.c src/protocol_edge.c src/subnet.c		2009-11-02 14:24:27 +01:00
..
device.c	Merge branch 'master' into 1.1	2009-11-02 14:24:27 +01:00