From: Guus Sliepen <guus@tinc-vpn.org>
Date: Mon, 20 Mar 2017 21:33:18 +0000 (+0100)
Subject: Merge remote-tracking branch 'dechamps/sleep' into 1.1
X-Git-Tag: release-1.1pre15~40
X-Git-Url: https://www.tinc-vpn.org/git/browse?a=commitdiff_plain;h=aebaaa8db80ec3931346af710f2182d129c74c41;hp=aebaaa8db80ec3931346af710f2182d129c74c41;p=tinc

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