From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 18 Feb 2012 13:31:08 +0000 (+0100)
Subject: Merge branch 'master' of black:tinc
X-Git-Tag: release-1.0.17~21
X-Git-Url: https://tinc-vpn.org/git/browse?a=commitdiff_plain;h=d1dcdf8eb6f800704be426b1ce6f6c1a8e65ba0d;p=tinc

Merge branch 'master' of black:tinc
---

d1dcdf8eb6f800704be426b1ce6f6c1a8e65ba0d