From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 14 Jul 2012 13:13:21 +0000 (+0200)
Subject: Merge branch 'master' into 1.1
X-Git-Tag: release-1.1pre3~117
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=268c8545aaf83b7433f43402f5c77e39e20006ef

Merge branch 'master' into 1.1
---

268c8545aaf83b7433f43402f5c77e39e20006ef