Guus Sliepen a22041922f Merge branch 'master' into 1.1 ... Conflicts: doc/tincd.8.in lib/pidfile.c src/graph.c src/net.c src/net.h src/net_packet.c src/net_setup.c src/net_socket.c src/netutl.c src/node.c src/node.h src/protocol_auth.c src/protocol_key.c src/tincd.c		2010-11-12 16:15:29 +01:00
..
device.c	Merge branch 'master' into 1.1	2010-11-12 16:15:29 +01:00