Merge branch 'master' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 14 Jul 2012 13:13:21 +0000 (15:13 +0200)
commit268c8545aaf83b7433f43402f5c77e39e20006ef
tree09875383d7fed8b3ee6155889f6b7549c8eae22e
parentbce177767d521b47efd458c5cd570959a98d940d
parentf13fd8c35068cd1f776e33362dcac40be9499035
Merge branch 'master' into 1.1
THANKS
doc/tinc.texi
src/bsd/device.c