Guus Sliepen 33f241d978 Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1 ... Conflicts: NEWS configure.in doc/tincd.8.in lib/pidfile.c lib/pidfile.h lib/xalloc.h lib/xmalloc.c src/conf.c src/conf.h src/connection.c src/connection.h src/event.c src/graph.c src/graph.h src/net.c src/net.h src/node.h src/openssl/crypto.c src/process.c src/protocol.c src/protocol_key.c src/route.c		2011-06-06 20:42:15 +02:00
..
device.c	Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1	2011-06-06 20:42:15 +02:00