Guus Sliepen 08aabbf931 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		2009-03-09 19:02:24 +01:00
..
device.c	Merge branch 'master' into 1.1	2009-03-09 19:02:24 +01:00