From: Guus Sliepen <guus@tinc-vpn.org>
Date: Fri, 5 Jan 2018 18:58:28 +0000 (+0100)
Subject: Merge remote-tracking branch 'dechamps/ipip' into 1.1
X-Git-Tag: release-1.1pre16~44
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=bdeba3f9c26f9225c17c097ca490dc651cd40b90;p=oweals%2Ftinc.git

Merge remote-tracking branch 'dechamps/ipip' into 1.1
---

bdeba3f9c26f9225c17c097ca490dc651cd40b90