Merge branch 'master' of black:tinc
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 13:31:08 +0000 (14:31 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 18 Feb 2012 13:31:08 +0000 (14:31 +0100)
commitd1dcdf8eb6f800704be426b1ce6f6c1a8e65ba0d
tree9002442c614f6e65732176377e9c21acc81ffc1f
parent1b2846d907adfc8472fc9da0c951c3243c7ee143
parent3b1fad04de6bed2f284fdf3d5b27d4162aeebc8c
Merge branch 'master' of black:tinc
doc/tinc.conf.5.in
doc/tinc.texi
src/linux/device.c
src/net_setup.c