From: Guus Sliepen Date: Sat, 12 Jul 2014 20:22:31 +0000 (+0200) Subject: Merge branch 'tincstart' of https://github.com/dechamps/tinc into 1.1 X-Git-Tag: release-1.1pre11~61 X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=f704304823df0ac868786ac89355eda38592dc3f Merge branch 'tincstart' of https://github.com/dechamps/tinc into 1.1 --- f704304823df0ac868786ac89355eda38592dc3f