Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 26 Mar 2012 18:06:39 +0000 (19:06 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 26 Mar 2012 18:06:39 +0000 (19:06 +0100)
commit1d9dacb1f26971e19463b5501c2410c57f780ecb
tree94b6c2c644d0844840b9026b6c30e53ca3cb5958
parent86c2990327fdf7ec1197aa73cb2b9a926a734db4
parent89f4574e0b1553c8e5dcbfc275e829a759b697f6
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

Conflicts:
src/logger.c
src/net_setup.c
configure.in
src/logger.c
src/net_setup.c
src/tincd.c