From: Sven-Haegar Koch Date: Fri, 26 Mar 2010 16:18:04 +0000 (+0100) Subject: Fixed 1.0 miss-merges X-Git-Tag: release-1.1pre1~82 X-Git-Url: http://tinc-vpn.org/git/browse?a=commitdiff_plain;ds=inline;h=ffa1dc73dcd62a856325641972a13d398aa8121c;hp=ffa1dc73dcd62a856325641972a13d398aa8121c;p=tinc Fixed 1.0 miss-merges ---