From: Guus Sliepen <guus@tinc-vpn.org>
Date: Tue, 21 Mar 2017 20:48:08 +0000 (+0100)
Subject: Merge remote-tracking branch 'VittGam/master'
X-Git-Tag: release-1.0.32~11
X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=commitdiff_plain;h=07ace0b6481efcc0a058aab7b90b95edd31709da;hp=-c

Merge remote-tracking branch 'VittGam/master'
---

07ace0b6481efcc0a058aab7b90b95edd31709da