Merge remote-tracking branch 'dechamps/sleep' into 1.1
authorGuus Sliepen <guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000 (22:33 +0100)
committerGuus Sliepen <guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000 (22:33 +0100)
commitaebaaa8db80ec3931346af710f2182d129c74c41
treedf7e3101920b0c8ae016f332d8dfcbbd09c8ed72
parent2c333f0f45f445d0811a364817d03df0c8cf2d2f
parentd21d97eaf5db9e848d8eee28784c4f54af85f43d
Merge remote-tracking branch 'dechamps/sleep' into 1.1