From: Guus Sliepen Date: Sat, 18 Feb 2012 10:43:00 +0000 (+0100) Subject: Merge branch 'master' of black:tinc X-Git-Tag: release-1.0.17~22 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=1b2846d907adfc8472fc9da0c951c3243c7ee143;p=tinc Merge branch 'master' of black:tinc --- 1b2846d907adfc8472fc9da0c951c3243c7ee143