projects
/
oweals
/
tinc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2c333f0
d21d97e
)
Merge remote-tracking branch 'dechamps/sleep' into 1.1
author
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000
(22:33 +0100)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Mon, 20 Mar 2017 21:33:18 +0000
(22:33 +0100)
Trivial merge