Merge remote-tracking branch 'dechamps/ipip' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Fri, 5 Jan 2018 18:58:28 +0000 (19:58 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Fri, 5 Jan 2018 18:58:28 +0000 (19:58 +0100)

Trivial merge