Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 27 Jul 2012 20:48:24 +0000 (22:48 +0200)
commit248d300f1be0d5f2aae39202041699ab2b46c56b
treeda035a2961c6afb4d9e6bf6df208906b69acffe5
parente1355e24eb7fe36bdb5dd7c818815fa266046a51
parent3391018efbd41858d42ccae6ae919749ba94c8db
Merge branch 'master' into 1.1
THANKS
doc/tinc.conf.5.in
doc/tinc.texi