Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Sat, 25 Feb 2012 21:52:57 +0000 (22:52 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Sat, 25 Feb 2012 21:52:57 +0000 (22:52 +0100)
commit36623e15a1c8685e5d8730345c1a7f9c93710fef
treef4ff62d7fe3e702ff2c43f4191b3340eb8a917c0
parent65d6f023c46ac3a087f59b60762f87c869783f21
parent5140656de6bcfda72951a7827b05414ce306e3ca
Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
src/route.c