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)
commitbdeba3f9c26f9225c17c097ca490dc651cd40b90
tree28326471464f395c3931691a727a77f3ba8ddf3e
parent696dc2ad9743c62e56a6d21addb8c4e8efbffec1
parent9ca5a3c43854fba782d87be080d7a97a88ef3427
Merge remote-tracking branch 'dechamps/ipip' into 1.1