From: Guus Sliepen <guus@tinc-vpn.org>
Date: Sat, 18 Feb 2012 10:43:00 +0000 (+0100)
Subject: Merge branch 'master' of black:tinc
X-Git-Tag: import-tinc-1.1~403^2~11
X-Git-Url: https://git.meshlink.io/?a=commitdiff_plain;h=1b2846d907adfc8472fc9da0c951c3243c7ee143;p=meshlink

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

1b2846d907adfc8472fc9da0c951c3243c7ee143